dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #07550
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2171: Improved logging in Live
------------------------------------------------------------
revno: 2171
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Sat 2010-09-18 22:22:07 +0200
message:
Improved logging in Live
modified:
dhis-live/src/main/java/org/hisp/dhis/SettingsWindow.java
dhis-live/src/main/java/org/hisp/dhis/TrayApp.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-live/src/main/java/org/hisp/dhis/SettingsWindow.java'
--- dhis-live/src/main/java/org/hisp/dhis/SettingsWindow.java 2010-09-18 12:33:38 +0000
+++ dhis-live/src/main/java/org/hisp/dhis/SettingsWindow.java 2010-09-18 20:22:07 +0000
@@ -27,12 +27,13 @@
package org.hisp.dhis;
-import java.util.ResourceBundle;
+import java.io.File;
+
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
import javax.swing.JOptionPane;
import javax.swing.UIManager;
-import javax.swing.JFileChooser;
-import java.io.File;
-import javax.swing.JFrame;
+
import org.hisp.dhis.config.ConfigType.DatabaseConfiguration.ConnectionTypes.ConnectionType;
import org.hisp.dhis.config.ConfigType.DatabaseConfiguration.DatabaseConnections.Connection;
=== modified file 'dhis-live/src/main/java/org/hisp/dhis/TrayApp.java'
--- dhis-live/src/main/java/org/hisp/dhis/TrayApp.java 2010-09-18 12:33:38 +0000
+++ dhis-live/src/main/java/org/hisp/dhis/TrayApp.java 2010-09-18 20:22:07 +0000
@@ -223,7 +223,6 @@
MenuItem openItem = new MenuItem( messageService.getString( "menuitem.open" ) );
openItem.addActionListener( new ActionListener()
{
-
@Override
public void actionPerformed( ActionEvent e )
{
@@ -243,11 +242,11 @@
MenuItem settingsItem = new MenuItem( messageService.getString( "menuitem.settings" ) );
settingsItem.addActionListener( new ActionListener()
{
-
@Override
public void actionPerformed( ActionEvent e )
{
- if(settingsWindow!= null && settingsWindow.isVisible()){
+ if ( settingsWindow!= null && settingsWindow.isVisible() )
+ {
settingsWindow.dispose();
}
settingsWindow = new SettingsWindow();
@@ -261,7 +260,6 @@
MenuItem exitItem = new MenuItem( messageService.getString( "menuitem.exit" ) );
exitItem.addActionListener( new ActionListener()
{
-
@Override
public void actionPerformed( ActionEvent e )
{
@@ -277,7 +275,6 @@
new Thread( new Runnable()
{
-
@Override
public void run()
{
@@ -307,7 +304,6 @@
MenuItem blankItem = new MenuItem( messageService.getString( "menuitem.blank" ) );
blankItem.addActionListener( new ActionListener()
{
-
@Override
public void actionPerformed( ActionEvent e )
{
@@ -325,7 +321,6 @@
writeHibernateProperties();
new Thread( new Runnable()
{
-
@Override
public void run()
{
@@ -376,7 +371,6 @@
MenuItem connItem = new MenuItem( dbConn.getName() );
connItem.addActionListener( new ActionListener()
{
-
@Override
public void actionPerformed( ActionEvent evt )
{
@@ -385,7 +379,6 @@
writeHibernateProperties();
new Thread( new Runnable()
{
-
@Override
public void run()
{
@@ -399,7 +392,6 @@
}
}
} ).start();
-
}
} );
databaseMenu.add( connItem );
@@ -474,24 +466,24 @@
{
String preferredBrowserPath = appConfig.getPreferredBrowser();
- if (preferredBrowserPath.length() > 0 )
- {
- try
- {
- log.debug( "Config reports browser path to be" + preferredBrowserPath );
- boolean browserIsValid = new File( preferredBrowserPath ).exists();
- if ( !browserIsValid )
- {
- preferredBrowserPath = "";
- log.info( "No preferred browser detected.Using default." );
+ if ( preferredBrowserPath.length() > 0 )
+ {
+ try
+ {
+ log.debug( "Preferred browser path read from config: " + preferredBrowserPath );
+
+ boolean browserExists = new File( preferredBrowserPath ).exists();
+ if ( !browserExists )
+ {
+ preferredBrowserPath = "";
+ log.warn( "Preferred browser could not be found." );
+ }
+ } catch ( Exception e )
+ {
+ log.warn( "There was a problem loading the preferred browser from the config file." );
}
-
- } catch ( Exception e )
- {
- log.warn( "There was a problem reading the preferred browser from the config file." );
- }
- log.info( "Preferred browser path reported to be " + preferredBrowserPath );
-
+
+ log.info( "Preferred browser path: " + preferredBrowserPath );
}
return preferredBrowserPath;
@@ -511,7 +503,7 @@
launchPreferredBrowser();
} catch ( Exception ex )
{
- log.warn( "Couldn't open preferred browser. Will attempt to revert to default. " + ex );
+ log.warn( "Couldn't open preferred browser. Will attempt to use default browser. " + ex );
}
} else
{
@@ -536,24 +528,23 @@
if ( preferredBrowserPath != null )
{
-
- String thisurl = getUrl();
- log.debug( "About to open " + thisurl + " with " + preferredBrowserPath );
- String openPrefBrowser = ( preferredBrowserPath + " " + thisurl );
- //try and launch the prefered browser
- try
- {
- Runtime rt = Runtime.getRuntime();
- rt.exec( openPrefBrowser );
- } catch ( IOException e )
- {
- log.error( "There was a problem opening the preferred browser. " + e );
- }
+ String thisurl = getUrl();
+ log.debug( "About to open " + thisurl + " with " + preferredBrowserPath );
+ String openPrefBrowser = ( preferredBrowserPath + " " + thisurl );
+ //try and launch the prefered browser
+ try
+ {
+ Runtime rt = Runtime.getRuntime();
+ rt.exec( openPrefBrowser );
+ } catch ( IOException e )
+ {
+ log.error( "There was a problem opening the preferred browser. " + e );
}
+ }
else
- {
- launchDefaultBrowser();
- }
+ {
+ launchDefaultBrowser();
+ }
}
/**
@@ -716,31 +707,30 @@
boolean confDirExists = createConfigDirectory();
props.store( new FileWriter( System.getProperty( "dhis2.home" ) + "/hibernate.properties" ), "DHIS2 Live Created" );
log.info( "Hibernate properties written at: " + System.getProperty( "dhis2.home" ) + "/hibernate.properties" );
- } catch ( IOException ioex )
+ } catch ( IOException ex )
{
- log.error( "Error with Hibernate Properties: " + ioex.getMessage() );
- JOptionPane.showMessageDialog( null, "Error with Hibernate Properties", "Database Error", JOptionPane.ERROR_MESSAGE );
+ log.error( "Error with Hibernate Properties: " + ex.getMessage() );
+ JOptionPane.showMessageDialog( null, "Error with Hibernate Properties", ex.getMessage(), JOptionPane.ERROR_MESSAGE );
System.exit( 1 );
}
}
+
private boolean createConfigDirectory()
{
-
File fileDirectory = new File(getInstallDir() + "/conf");
boolean success = fileDirectory.exists();
if ( !success )
- {
- try
- {
- success = fileDirectory.mkdir();
-
- }
- catch (Exception e)
- {
- log.error ("Could not create config directory");
- }
- }
+ {
+ try
+ {
+ success = fileDirectory.mkdir();
+
+ }
+ catch (Exception e)
+ {
+ log.error ("Could not create config directory");
+ }
+ }
return success;
- }
-
+ }
}
