From 40d04f4874af87e78acaa79acd12d508d390bef4 Mon Sep 17 00:00:00 2001
From: mattijs <m.janssens@opencfd.co.uk>
Date: Fri, 2 May 2008 11:41:51 +0100
Subject: [PATCH] update to javac 1.5
---
.../preProcessing/FoamX/Java/FoamX/App.java | 2 +-
.../CaseManagement/CaseBrowserModel.java | 18 ++---
.../CaseManagement/CaseBrowserPanel.java | 8 +--
.../FoamX/CaseManagement/CaseManager.java | 12 ++--
.../Java/FoamX/CaseManagement/CasePanel.java | 2 +-
.../BoundaryDefinitionModelItem.java | 6 +-
.../EntryCache/CaseNameCache.java | 2 +-
.../EntryCache/CompoundCache.java | 2 +-
.../EntryCache/DictionaryCache.java | 3 +-
.../EntryCache/DimensionSetCache.java | 2 +-
.../EntryCache/FixedListCache.java | 2 +-
.../EntryCache/HostNameCache.java | 2 +-
.../EntryCache/ListCache.java | 2 +-
.../EntryCache/RootAndCaseCache.java | 2 +-
.../EntryCache/RootDirCache.java | 2 +-
.../EntryCache/SelectionCache.java | 2 +-
.../Modules/CaseEditor/CaseEditorModule.java | 2 +-
.../Modules/CaseEditor/PatchEditorModel.java | 6 +-
.../Modules/CaseEditor/PatchEditorWindow.java | 2 +-
.../ProcessManagement/ProcessEditor.java | 2 +-
.../Java/FoamX/Tools/InvokeUtilityAction.java | 2 +-
.../Java/FoamX/Util/CollapseTreeAction.java | 8 +--
.../Java/FoamX/Util/ExpandTreeAction.java | 8 +--
.../FoamX/Java/FoamX/Util/FileEditor.java | 2 +-
.../FoamX/Java/FoamX/Util/RunPanel.java | 10 +--
.../FoamX/Java/FoamX/Util/SimpleEditor.java | 2 +-
.../FoamX/WindowManagement/WindowManager.java | 6 +-
bin/FoamX | 66 ++++++-------------
28 files changed, 79 insertions(+), 106 deletions(-)
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/App.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/App.java
index cf518f4d7c8..73f1ecc312b 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/App.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/App.java
@@ -176,7 +176,7 @@ public class App
mainFrame_.initialise(args);
- mainFrame_.show();
+ mainFrame_.setVisible(true);
}
//--------------------------------------------------------------------------
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CaseBrowserModel.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CaseBrowserModel.java
index cf031f4a9fa..dcdba133ecf 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CaseBrowserModel.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CaseBrowserModel.java
@@ -172,10 +172,10 @@ public class CaseBrowserModel
keyMap_.clear();
// Loop over all host nodes.
- Enumeration enum = hostMap_.keys();
- while (enum.hasMoreElements())
+ Enumeration iter = hostMap_.keys();
+ while (iter.hasMoreElements())
{
- String hostName = (String)enum.nextElement();
+ String hostName = (String)iter.nextElement();
// Get host node.
DefaultMutableTreeNode hostNode =
@@ -306,10 +306,10 @@ public class CaseBrowserModel
// {
//
// // Loop over all host nodes.
-// Enumeration enum = hostMap_.keys();
-// while (enum.hasMoreElements())
+// itereration iter = hostMap_.keys();
+// while (iter.hasMoreElements())
// {
-// String hostName = (String)enum.nextElement();
+// String hostName = (String)iter.nextElement();
//
// // Get host node.
// DefaultMutableTreeNode hostNode =
@@ -862,10 +862,10 @@ public class CaseBrowserModel
keyMap_.clear();
// Loop over all host nodes.
- Enumeration enum = hostMap_.keys();
- while (enum.hasMoreElements())
+ Enumeration iter = hostMap_.keys();
+ while (iter.hasMoreElements())
{
- String hostName = (String)enum.nextElement();
+ String hostName = (String)iter.nextElement();
// Get host node.
DefaultMutableTreeNode hostNode =
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CaseBrowserPanel.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CaseBrowserPanel.java
index 7f70f4fbbc0..e10bbfefa25 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CaseBrowserPanel.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CaseBrowserPanel.java
@@ -1720,7 +1720,7 @@ public class CaseBrowserPanel
null,
context.getCaseBrowser()
);
- processEditor.show();
+ processEditor.setVisible(true);
}
}
}
@@ -1795,7 +1795,7 @@ public class CaseBrowserPanel
dictHolder.value
);
compoundEditor.setTitle("OpenFOAM Dictionary");
- compoundEditor.show();
+ compoundEditor.setVisible(true);
if (dictHolder.value.modified())
{
@@ -2511,7 +2511,7 @@ public class CaseBrowserPanel
}
// Show the dialog.
- dlg.show();
+ dlg.setVisible(true);
if (!dlg.wasCancelled())
{
@@ -2881,7 +2881,7 @@ public class CaseBrowserPanel
controlDict.getDictEntry()
);
compoundEditor.setTitle("Clone Case");
- compoundEditor.show();
+ compoundEditor.setVisible(true);
// Show busy cursor.
BusyCursor busyCursor = new BusyCursor
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CaseManager.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CaseManager.java
index c78db69db4c..6ee519e1437 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CaseManager.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CaseManager.java
@@ -137,11 +137,11 @@ public class CaseManager
int caseNo = 0;
// Close all cases.
- Enumeration enum = caseMap_.elements();
- while (enum.hasMoreElements())
+ Enumeration iter = caseMap_.elements();
+ while (iter.hasMoreElements())
{
// Get next case.
- CasePanel casePanel = (CasePanel)enum.nextElement();
+ CasePanel casePanel = (CasePanel)iter.nextElement();
// Give option of saving if modified
casePanel.checkAndSave
@@ -176,11 +176,11 @@ public class CaseManager
// );
//caseNo = 0;
//// Close all cases.
- //enum = casePostMap_.elements();
- //while (enum.hasMoreElements())
+ //iter = casePostMap_.elements();
+ //while (iter.hasMoreElements())
//{
// // Get next case.
- // CasePostPanel casePostPanel = (CasePostPanel)enum.nextElement();
+ // CasePostPanel casePostPanel = (CasePostPanel)iter.nextElement();
//
// // Do exactly if 'close case' on casePostPanel was pressed
// casePostClosed
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CasePanel.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CasePanel.java
index e0655119138..8c7358bb03c 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CasePanel.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/CaseManagement/CasePanel.java
@@ -1295,7 +1295,7 @@ public class CasePanel
"controlDict",
null
);
- runPanel.show();
+ runPanel.setVisible(true);
}
}
}
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/ApplicationEditor/BoundaryDefinitionModelItem.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/ApplicationEditor/BoundaryDefinitionModelItem.java
index 3852cc52a78..2a68b2d87b5 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/ApplicationEditor/BoundaryDefinitionModelItem.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/ApplicationEditor/BoundaryDefinitionModelItem.java
@@ -314,12 +314,12 @@ public class BoundaryDefinitionModelItem
patchPhysicalTypeDesc_.patchType(patchType_);
// Set the patch field types.
- Enumeration enum = patchFieldTypeMap_.keys();
+ Enumeration iter = patchFieldTypeMap_.keys();
StringPair[] patchFieldTypes = new StringPair[patchFieldTypeMap_.size()];
int nField = 0;
- while (enum.hasMoreElements())
+ while (iter.hasMoreElements())
{
- String fieldName = (String)enum.nextElement();
+ String fieldName = (String)iter.nextElement();
String patchFieldType = (String)patchFieldTypeMap_.get(fieldName);
patchFieldTypes[nField++] = new StringPair(fieldName, patchFieldType);
}
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/CaseNameCache.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/CaseNameCache.java
index d2fe93bfb45..41b78bc30de 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/CaseNameCache.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/CaseNameCache.java
@@ -101,7 +101,7 @@ public class CaseNameCache
App.getRootFrame(),
CaseBrowserPanel.SELECT_CASE_MODE
);
- caseChooser.show();
+ caseChooser.setVisible(true);
if
(
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/CompoundCache.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/CompoundCache.java
index 1074c9b6e98..d663fbeae77 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/CompoundCache.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/CompoundCache.java
@@ -174,7 +174,7 @@ public class CompoundCache
);
editor.setTitle(displayName_);
- editor.show();
+ editor.setVisible(true);
// Update the cached display string.
displayValue_ = getCompoundDisplayString(3);
// Signal that editing has stopped.
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/DictionaryCache.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/DictionaryCache.java
index d94fd17d0ad..005a274387c 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/DictionaryCache.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/DictionaryCache.java
@@ -122,8 +122,7 @@ public class DictionaryCache
dictEntry_
);
editor.setTitle(displayName_);
-
- editor.show();
+ editor.setVisible(true);
// Update the cached display string.
displayValue_ = getCompoundDisplayString(3);
// Signal that editing has stopped.
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/DimensionSetCache.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/DimensionSetCache.java
index 5488c0a3f14..34c4abda9f6 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/DimensionSetCache.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/DimensionSetCache.java
@@ -139,7 +139,7 @@ public class DimensionSetCache
editor.setTitle(displayName_);
- editor.show();
+ editor.setVisible(true);
// Update value in case it has been updated.
getEntryValue();
// Signal that editing has stopped.
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/FixedListCache.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/FixedListCache.java
index ddf12be545c..f22df697eca 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/FixedListCache.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/FixedListCache.java
@@ -135,7 +135,7 @@ public class FixedListCache
typeDescriptor_
);
editor.setTitle(displayName_);
- editor.show();
+ editor.setVisible(true);
// Update the cached display string.
displayValue_ = getCompoundDisplayString(3);
// Signal that editing has stopped.
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/HostNameCache.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/HostNameCache.java
index eea1b3e9d70..90f68f4353f 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/HostNameCache.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/HostNameCache.java
@@ -124,7 +124,7 @@ public class HostNameCache
// Pop up host chooser panel
HostChooserDlg hostChooser =
new HostChooserDlg(App.getRootFrame());
- hostChooser.show();
+ hostChooser.setVisible(true);
if (hostChooser.getHostName() != null)
{
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/ListCache.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/ListCache.java
index 48e8e0b7ac6..ec0560a822b 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/ListCache.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/ListCache.java
@@ -189,7 +189,7 @@ public class ListCache
);
editor.setTitle(displayName_);
- editor.show();
+ editor.setVisible(true);
// Signal that editing has stopped.
editor_.stopCellEditing();
}
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/RootAndCaseCache.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/RootAndCaseCache.java
index 19a556bfcb5..816ece6e616 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/RootAndCaseCache.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/RootAndCaseCache.java
@@ -187,7 +187,7 @@ public class RootAndCaseCache
App.getRootFrame(),
CaseBrowserPanel.SELECT_CASE_MODE
);
- caseChooser.show();
+ caseChooser.setVisible(true);
if
(
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/RootDirCache.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/RootDirCache.java
index 6f7efb85a9a..7a67be983ed 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/RootDirCache.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/RootDirCache.java
@@ -129,7 +129,7 @@ public class RootDirCache
App.getRootFrame(),
CaseBrowserPanel.SELECT_ROOT_MODE
);
- caseChooser.show();
+ caseChooser.setVisible(true);
if
(
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/SelectionCache.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/SelectionCache.java
index bf1fc031ddd..c50179685ee 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/SelectionCache.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Editors/DictionaryEntryEditor/EntryCache/SelectionCache.java
@@ -127,7 +127,7 @@ public class SelectionCache
);
editor.setTitle(displayName_);
- editor.show();
+ editor.setVisible(true);
// Update the cached display string.
displayValue_ = getSelectionDisplayString();
// Signal that editing has stopped.
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Modules/CaseEditor/CaseEditorModule.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Modules/CaseEditor/CaseEditorModule.java
index 7e17c03cc24..8d5c01e23c5 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Modules/CaseEditor/CaseEditorModule.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Modules/CaseEditor/CaseEditorModule.java
@@ -1783,7 +1783,7 @@ public class CaseEditorModule
CaseBrowserPanel.SELECT_CASE_MODE
);
- caseChooser.show();
+ caseChooser.setVisible(true);
if
(
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Modules/CaseEditor/PatchEditorModel.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Modules/CaseEditor/PatchEditorModel.java
index 2acd8254dd5..bcb17533ec5 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Modules/CaseEditor/PatchEditorModel.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Modules/CaseEditor/PatchEditorModel.java
@@ -193,11 +193,11 @@ public class PatchEditorModel
}
// Now that the map is initialised, build the tree.
- Enumeration enum = boundaryDefMap_.elements();
- while (enum.hasMoreElements())
+ Enumeration iter = boundaryDefMap_.elements();
+ while (iter.hasMoreElements())
{
DefaultMutableTreeNode node =
- (DefaultMutableTreeNode)enum.nextElement();
+ (DefaultMutableTreeNode)iter.nextElement();
BoundaryDefinitionModelItem nodeInfo =
(BoundaryDefinitionModelItem)node.getUserObject();
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Modules/CaseEditor/PatchEditorWindow.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Modules/CaseEditor/PatchEditorWindow.java
index a597fae040e..c57243bc87b 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Modules/CaseEditor/PatchEditorWindow.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Modules/CaseEditor/PatchEditorWindow.java
@@ -211,7 +211,7 @@ public class PatchEditorWindow
// Initialise and show the boundary type selector dialog.
PatchPhysicalTypeSelectorDlg dlg = new PatchPhysicalTypeSelectorDlg(null, patchModel_);
- dlg.show();
+ dlg.setVisible(true);
// If the dialog wasn't cancelled, update the boundary type name.
if (!dlg.wasCancelled())
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/ProcessManagement/ProcessEditor.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/ProcessManagement/ProcessEditor.java
index 99fea675b67..527d0b176ba 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/ProcessManagement/ProcessEditor.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/ProcessManagement/ProcessEditor.java
@@ -327,7 +327,7 @@ public class ProcessEditor extends javax.swing.JDialog
labels, values
);
- dlg.show();
+ dlg.setVisible(true);
}
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Tools/InvokeUtilityAction.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Tools/InvokeUtilityAction.java
index eb03f22fd1b..439dfb91955 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Tools/InvokeUtilityAction.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Tools/InvokeUtilityAction.java
@@ -343,7 +343,7 @@ public class InvokeUtilityAction
desc.name + "Dict",
controlDict
);
- runPanel.show();
+ runPanel.setVisible(true);
}
catch (Exception ex)
{
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/CollapseTreeAction.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/CollapseTreeAction.java
index 0dbd3cefa7c..803e37dd561 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/CollapseTreeAction.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/CollapseTreeAction.java
@@ -62,10 +62,10 @@ public class CollapseTreeAction
TreeModel model = tree_.getModel();
DefaultMutableTreeNode root = (DefaultMutableTreeNode)model.getRoot();
- Enumeration enum = root.depthFirstEnumeration();
- while (enum.hasMoreElements())
+ Enumeration iter = root.depthFirstEnumeration();
+ while (iter.hasMoreElements())
{
- DefaultMutableTreeNode node = (DefaultMutableTreeNode)enum.nextElement();
+ DefaultMutableTreeNode node = (DefaultMutableTreeNode)iter.nextElement();
TreePath tp = new TreePath(node.getPath());
tree_.collapsePath(tp);
}
@@ -79,4 +79,4 @@ public class CollapseTreeAction
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
-}
\ No newline at end of file
+}
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/ExpandTreeAction.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/ExpandTreeAction.java
index 8a258e36426..bff66540cc1 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/ExpandTreeAction.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/ExpandTreeAction.java
@@ -62,10 +62,10 @@ public class ExpandTreeAction
TreeModel model = tree_.getModel();
DefaultMutableTreeNode root = (DefaultMutableTreeNode)model.getRoot();
- Enumeration enum = root.depthFirstEnumeration();
- while (enum.hasMoreElements())
+ Enumeration iter = root.depthFirstEnumeration();
+ while (iter.hasMoreElements())
{
- DefaultMutableTreeNode node = (DefaultMutableTreeNode)enum.nextElement();
+ DefaultMutableTreeNode node = (DefaultMutableTreeNode)iter.nextElement();
TreePath tp = new TreePath(node.getPath());
tree_.expandPath(tp);
}
@@ -79,4 +79,4 @@ public class ExpandTreeAction
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
-}
\ No newline at end of file
+}
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/FileEditor.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/FileEditor.java
index 20b9f954dde..450e415c4c1 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/FileEditor.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/FileEditor.java
@@ -179,7 +179,7 @@ public class FileEditor
simpleEditor_.openFile(workFile_);
}
- simpleEditor_.show();
+ simpleEditor_.setVisible(true);
}
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/RunPanel.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/RunPanel.java
index 7ca34f92e72..c7148d011cb 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/RunPanel.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/RunPanel.java
@@ -168,7 +168,7 @@ public class RunPanel
}
- show();
+ setVisible(true);
}
catch(FoamXError fxErr)
{
@@ -607,7 +607,7 @@ public class RunPanel
// Pop up host chooser panel
HostChooserDlg hostChooser =
new HostChooserDlg(parent_);
- hostChooser.show();
+ hostChooser.setVisible(true);
if (hostChooser.getHostName() != null)
{
@@ -680,7 +680,7 @@ public class RunPanel
JDialog dialog = pane.createDialog(this, "FoamX...");
dialog.setModal(false);
dialog.pack();
- dialog.show();
+ dialog.setVisible(true);
// Install new file change listener
StringHolder holder = new StringHolder();
@@ -755,7 +755,7 @@ public class RunPanel
parent_,
argumentsEntry.getDictEntry()
);
- compoundEditor.show();
+ compoundEditor.setVisible(true);
// Update displayed value
setArgsField(false, argumentsEntry);
@@ -791,7 +791,7 @@ public class RunPanel
controlDict_.getDictEntry()
);
- compoundEditor.show();
+ compoundEditor.setVisible(true);
DictionaryEntryCache argumentsEntry =
controlDict_.getSubEntry("arguments");
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/SimpleEditor.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/SimpleEditor.java
index f5d69404e80..e7a7c0d2fcb 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/SimpleEditor.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/Util/SimpleEditor.java
@@ -700,6 +700,6 @@ public class SimpleEditor extends JFrame implements FileListener
frame.openFile(file);
- frame.show();
+ frame.setVisible(true);
}
}
diff --git a/applications/utilities/preProcessing/FoamX/Java/FoamX/WindowManagement/WindowManager.java b/applications/utilities/preProcessing/FoamX/Java/FoamX/WindowManagement/WindowManager.java
index c0c3b4d7b2b..9ceae61422b 100644
--- a/applications/utilities/preProcessing/FoamX/Java/FoamX/WindowManagement/WindowManager.java
+++ b/applications/utilities/preProcessing/FoamX/Java/FoamX/WindowManagement/WindowManager.java
@@ -335,10 +335,10 @@ public class WindowManager
{
int x = 0;
- Enumeration enum = windowMap_.elements();
- while (enum.hasMoreElements())
+ Enumeration iter = windowMap_.elements();
+ while (iter.hasMoreElements())
{
- FoamXInternalFrame frame = (FoamXInternalFrame)enum.nextElement();
+ FoamXInternalFrame frame = (FoamXInternalFrame)iter.nextElement();
frame.setBounds(x, x, defaultFrameWidth_, defaultFrameHeight_);
x += 20;
diff --git a/bin/FoamX b/bin/FoamX
index 32a12cd8c33..9e914c75225 100755
--- a/bin/FoamX
+++ b/bin/FoamX
@@ -30,8 +30,6 @@
# Loader for FoamX Java Client.
#
#------------------------------------------------------------------------------
-# Set default JDK path.
-jdkhome="/usr/java/jdk1.4"
Script=${0##*/}
@@ -76,18 +74,19 @@ cleanup() {
}
-# isValid jobControlFile
-isValid() {
- grep 'startDate' $1 > /dev/null && \
- grep 'startTime' $1 > /dev/null && \
- grep 'userName' $1 > /dev/null && \
- grep 'foamVersion' $1 > /dev/null && \
- grep 'code' $1 > /dev/null && \
- grep 'currentDir' $1 > /dev/null && \
- grep 'argList' $1 > /dev/null
+## isValid jobControlFile
+#isValid() {
+# grep 'startDate' $1 > /dev/null && \
+# grep 'startTime' $1 > /dev/null && \
+# grep 'userName' $1 > /dev/null && \
+# grep 'foamVersion' $1 > /dev/null && \
+# grep 'code' $1 > /dev/null && \
+# grep 'currentDir' $1 > /dev/null && \
+# grep 'argList' $1 > /dev/null
+#
+# return $?
+#}
- return $?
-}
#-------------------------
#
@@ -95,33 +94,12 @@ isValid() {
#
#-------------------------
-# If JAVA_PATH or JAVA_HOME are set, it overrides the default.
-if [ -n "$JAVA_PATH" ]; then
- jdkhome=$JAVA_PATH
-elif [ -n "$JAVA_HOME" ]; then
- jdkhome=$JAVA_HOME
-fi
-
-# check that the JDK exists.
-if [ -z "$jdkhome" ] ; then
- echo "Java path not set. Please set JAVA_PATH to the JDK installation"
- echo "directory."
- echo ""
- exit 1
-fi
-if [ ! -x "$jdkhome/bin/java" ] ; then
- echo "Cannot find JDK at $jdkhome. Please set JAVA_PATH to the"
- echo "JDK installation directory."
- echo ""
- exit 1
-fi
-
-if [ -z "$FOAM_JOB_DIR" ]; then
- echo "FOAM_JOB_DIR environment variable not set. This should point to the"
- echo "Foam jobControl directory."
- echo ""
- exit 1
-fi
+#if [ -z "$FOAM_JOB_DIR" ]; then
+# echo "FOAM_JOB_DIR environment variable not set. This should point to the"
+# echo "Foam jobControl directory."
+# echo ""
+# exit 1
+#fi
# Make sure that the FoamX configuration directory is available.
if [ ! -d "$FOAMX_CONFIG" ] ; then
@@ -232,12 +210,8 @@ if [ "$XHB_PID" ]; then
fi
#- For mico > 2.3.7 : force to use 1.0
-if [ `uname -s` = 'AIX' ]; then
- orbArgs=''
-else
- #orbArgs="-ORBDefaultInitRef corbaloc:iiop:1.0:$HOSTNAME:$HOSTPORT"
- orbArgs="-ORBDefaultInitRef corbaloc:iiop:1.0:$HOSTNAME:$HOSTPORT -ORBInitialPort $HOSTPORT -ORBInitialHost $HOSTNAME"
-fi
+#orbArgs="-ORBDefaultInitRef corbaloc:iiop:1.0:$HOSTNAME:$HOSTPORT"
+orbArgs="-ORBDefaultInitRef corbaloc:iiop:1.0:$HOSTNAME:$HOSTPORT -ORBInitialPort $HOSTPORT -ORBInitialHost $HOSTNAME"
#echo "Starting Java with ORB arguments : $orbArgs"
# Set Language to English
--
GitLab