summaryrefslogtreecommitdiff
path: root/scripting/workben
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-04-26 08:36:04 +0200
committerNoel Grandin <noel@peralex.com>2013-04-26 08:36:04 +0200
commit6f17a2f66fa2a4fec56334783410005c4f2f357a (patch)
tree728696d0f0603783e8d50b9c4c7b43f3016d51ce /scripting/workben
parent6d4c1f0d4a623bf7f3b3a0af2ece5c969d5aec77 (diff)
Java cleanup, access static methods using correct syntax
Change-Id: I8443aef43d82de33ac7cb47d40cc5b544f7c9c87
Diffstat (limited to 'scripting/workben')
-rw-r--r--scripting/workben/ifc/scripting/SecurityDialogUtil.java2
-rw-r--r--scripting/workben/installer/Final.java2
-rw-r--r--scripting/workben/installer/IdeFinal.java2
-rw-r--r--scripting/workben/installer/IdeVersion.java4
-rw-r--r--scripting/workben/installer/InstUtil.java10
-rw-r--r--scripting/workben/installer/NavPanel.java2
-rw-r--r--scripting/workben/installer/Version.java4
7 files changed, 13 insertions, 13 deletions
diff --git a/scripting/workben/ifc/scripting/SecurityDialogUtil.java b/scripting/workben/ifc/scripting/SecurityDialogUtil.java
index bbd2ee33aa4d..1fdfc3d9fffe 100644
--- a/scripting/workben/ifc/scripting/SecurityDialogUtil.java
+++ b/scripting/workben/ifc/scripting/SecurityDialogUtil.java
@@ -100,7 +100,7 @@ public void run()
AccessibilityTools at = new AccessibilityTools();
XWindow xWindow = UnoRuntime.queryInterface(
XWindow.class,tk.getActiveTopWindow());
- XAccessible xRoot = at.getAccessibleObject(xWindow);
+ XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
xCon = xRoot.getAccessibleContext();
}
catch (Exception e)
diff --git a/scripting/workben/installer/Final.java b/scripting/workben/installer/Final.java
index 95d2a39d5b05..51646315d2b1 100644
--- a/scripting/workben/installer/Final.java
+++ b/scripting/workben/installer/Final.java
@@ -76,7 +76,7 @@ public class Final extends javax.swing.JPanel implements ActionListener, Install
nav.enableNext(false);
nav.enableBack(false);
nav.enableCancel(false);
- ArrayList<?> locations = wizard.getLocations();
+ ArrayList<?> locations = InstallWizard.getLocations();
//System.out.println("here "+locations.size());
// Returned 1
String progpath=null;
diff --git a/scripting/workben/installer/IdeFinal.java b/scripting/workben/installer/IdeFinal.java
index bfc4b4b0766f..2d91929358ab 100644
--- a/scripting/workben/installer/IdeFinal.java
+++ b/scripting/workben/installer/IdeFinal.java
@@ -73,7 +73,7 @@ public class IdeFinal extends javax.swing.JPanel implements ActionListener, Inst
nav.enableNext(false);
nav.enableBack(false);
nav.enableCancel(false);
- ArrayList<?> locations = wizard.getLocations();
+ ArrayList<?> locations = InstallWizard.getLocations();
//System.out.println("here "+locations.size());
// Returned 1
String progpath=null;
diff --git a/scripting/workben/installer/IdeVersion.java b/scripting/workben/installer/IdeVersion.java
index 229eeed44f97..052e3f07811d 100644
--- a/scripting/workben/installer/IdeVersion.java
+++ b/scripting/workben/installer/IdeVersion.java
@@ -175,12 +175,12 @@ public class IdeVersion extends javax.swing.JPanel implements ActionListener, Ta
public void actionPerformed(ActionEvent ev) {
- wizard.clearLocations();
+ InstallWizard.clearLocations();
int len = tableModel.data.size();
for (int i = 0; i < len; i++) {
ArrayList<?> list = tableModel.data.get(i);
if (((Boolean)list.get(0)).booleanValue() == true)
- wizard.storeLocation((String)list.get(2));
+ InstallWizard.storeLocation((String)list.get(2));
}
//System.out.println(wizard.getLocations());
diff --git a/scripting/workben/installer/InstUtil.java b/scripting/workben/installer/InstUtil.java
index 05d265d147ff..c6a713153e87 100644
--- a/scripting/workben/installer/InstUtil.java
+++ b/scripting/workben/installer/InstUtil.java
@@ -427,24 +427,24 @@ public class InstUtil {
File f = null;
try
{
- f = inst.buildSversionLocation();
+ f = InstUtil.buildSversionLocation();
}
catch (IOException e)
{
e.printStackTrace();
System.out.println(e.getMessage());
}
- if (!inst.verifySversionExists(f)) {
+ if (!InstUtil.verifySversionExists(f)) {
System.err.println("Problem with sversion.ini");
}
try {
- Properties vers = inst.getOfficeVersions(f);
+ Properties vers = InstUtil.getOfficeVersions(f);
} catch (IOException e) {
e.printStackTrace();
System.err.println(e);
}
- System.out.println(inst.getJavaVersion());
- if (!inst.isCorrectJavaVersion()) {
+ System.out.println(InstUtil.getJavaVersion());
+ if (!InstUtil.isCorrectJavaVersion()) {
System.err.println("Not correct Java Version");
}
}
diff --git a/scripting/workben/installer/NavPanel.java b/scripting/workben/installer/NavPanel.java
index b1738ddad4f7..cee9fc53ead8 100644
--- a/scripting/workben/installer/NavPanel.java
+++ b/scripting/workben/installer/NavPanel.java
@@ -36,7 +36,7 @@ public class NavPanel extends JPanel implements ActionListener {
gridBagConstraints1 = new java.awt.GridBagConstraints();
gridBagConstraints1.insets = new java.awt.Insets(1, 1, 1, 1);
- gridBagConstraints1.anchor = gridBagConstraints1.WEST;
+ gridBagConstraints1.anchor = GridBagConstraints.WEST;
gridBagConstraints2 = new java.awt.GridBagConstraints();
gridBagConstraints2.gridx = 2;
diff --git a/scripting/workben/installer/Version.java b/scripting/workben/installer/Version.java
index 17ec8e7c3230..d1c7c819f6f4 100644
--- a/scripting/workben/installer/Version.java
+++ b/scripting/workben/installer/Version.java
@@ -208,12 +208,12 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table
public void actionPerformed(ActionEvent ev) {
- wizard.clearLocations();
+ InstallWizard.clearLocations();
int len = tableModel.data.size();
for (int i = 0; i < len; i++) {
ArrayList<?> list = tableModel.data.get(i);
if (((Boolean)list.get(0)).booleanValue() == true)
- wizard.storeLocation((String)list.get(2));
+ InstallWizard.storeLocation((String)list.get(2));
}
//System.out.println(wizard.getLocations());