Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Tiede2013-12-12 08:52:25 -0500
committerMarkus Tiede2013-12-12 08:52:25 -0500
commitd31d8b2b726f360f4440f4b383e5e93174e23cab (patch)
tree436c8e91a0fe7c2585a4f54d7a0debe04972852a /org.eclipse.jubula.autagent
parent832a75ca5976f48b5de20bcf3b761935befa1676 (diff)
downloadorg.eclipse.jubula.core-d31d8b2b726f360f4440f4b383e5e93174e23cab.tar.gz
org.eclipse.jubula.core-d31d8b2b726f360f4440f4b383e5e93174e23cab.tar.xz
org.eclipse.jubula.core-d31d8b2b726f360f4440f4b383e5e93174e23cab.zip
Sprint task - fix for issue http://bugzilla.bredex.de/729
Diffstat (limited to 'org.eclipse.jubula.autagent')
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/desktop/DesktopIntegration.java7
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialog.java15
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsole.java15
3 files changed, 4 insertions, 33 deletions
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/desktop/DesktopIntegration.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/desktop/DesktopIntegration.java
index 30894c26d..2e5f0ef84 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/desktop/DesktopIntegration.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/desktop/DesktopIntegration.java
@@ -69,11 +69,12 @@ public class DesktopIntegration implements PropertyChangeListener {
SystemTray tray = SystemTray.getSystemTray();
URL imageURL;
- if (EnvironmentUtils.isMacOS()) {
- imageURL = this.getClass().getClassLoader().getResource("resources/gdagent_osx.png"); //$NON-NLS-1$
+ final ClassLoader classLoader = this.getClass().getClassLoader();
+ if (EnvironmentUtils.isMacOS()) {
+ imageURL = classLoader.getResource("resources/gdagent_osx.png"); //$NON-NLS-1$
} else {
- imageURL = this.getClass().getClassLoader().getResource("resources/gdagent.png"); //$NON-NLS-1$
+ imageURL = classLoader.getResource("resources/gdagent.png"); //$NON-NLS-1$
}
Image image = Toolkit.getDefaultToolkit().getImage(imageURL);
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialog.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialog.java
index bf67b67d8..d5f82263b 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialog.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialog.java
@@ -30,8 +30,6 @@ import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.Border;
import org.eclipse.jubula.tools.i18n.CompSystemI18n;
@@ -119,20 +117,7 @@ public class ChooseCheckModeDialog extends JFrame {
*/
public ChooseCheckModeDialog() {
super();
- try {
- UIManager.setLookAndFeel(UIManager
- .getSystemLookAndFeelClassName());
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- } catch (InstantiationException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (UnsupportedLookAndFeelException e) {
- e.printStackTrace();
- }
createPart();
- // nothing
}
/**
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsole.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsole.java
index 6b71119c9..c214f462b 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsole.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsole.java
@@ -20,8 +20,6 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.Border;
import org.eclipse.jubula.tools.constants.StringConstants;
@@ -59,20 +57,7 @@ public class ObservationConsole extends JFrame {
*/
public ObservationConsole() {
super();
- try {
- UIManager.setLookAndFeel(UIManager
- .getSystemLookAndFeelClassName());
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- } catch (InstantiationException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (UnsupportedLookAndFeelException e) {
- e.printStackTrace();
- }
createPart();
- // nothing
}
/**

Back to the top