From 6f17a2f66fa2a4fec56334783410005c4f2f357a Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 26 Apr 2013 08:36:04 +0200
Subject: Java cleanup, access static methods using correct syntax

Change-Id: I8443aef43d82de33ac7cb47d40cc5b544f7c9c87
---
 scripting/workben/installer/Final.java      |  2 +-
 scripting/workben/installer/IdeFinal.java   |  2 +-
 scripting/workben/installer/IdeVersion.java |  4 ++--
 scripting/workben/installer/InstUtil.java   | 10 +++++-----
 scripting/workben/installer/NavPanel.java   |  2 +-
 scripting/workben/installer/Version.java    |  4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'scripting/workben/installer')

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());
-- 
cgit