Index: src/modeler/java/org/objectstyle/cayenne/modeler/dialog/EditDerivedParamsDialog.java =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/EditDerivedParamsDialog.java,v retrieving revision 1.5 diff -u -r1.5 EditDerivedParamsDialog.java --- src/modeler/java/org/objectstyle/cayenne/modeler/dialog/EditDerivedParamsDialog.java 19 Mar 2005 19:23:50 -0000 1.5 +++ src/modeler/java/org/objectstyle/cayenne/modeler/dialog/EditDerivedParamsDialog.java 14 Apr 2005 18:17:27 -0000 @@ -200,10 +200,10 @@ attr.getEntity(), AttributeEvent.CHANGE)); - hide(); + setVisible(false); } protected void cancel() { - hide(); + setVisible(false); } } Index: src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ErrorDebugDialog.java =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ErrorDebugDialog.java,v retrieving revision 1.6 diff -u -r1.6 ErrorDebugDialog.java --- src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ErrorDebugDialog.java 19 Mar 2005 19:23:50 -0000 1.6 +++ src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ErrorDebugDialog.java 14 Apr 2005 18:17:27 -0000 @@ -99,7 +99,7 @@ ErrorDebugDialog dialog = new ErrorDebugDialog(Application.getFrame(), "CayenneModeler Error", th, true); - dialog.show(); + dialog.setVisible(true); } public static void guiWarning(Throwable th, String message) { @@ -108,7 +108,7 @@ } WarningDialog dialog = new WarningDialog(Application.getFrame(), message, th, false); - dialog.show(); + dialog.setVisible(true); } /** Index: src/modeler/java/org/objectstyle/cayenne/modeler/dialog/OverwriteDialog.java =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/OverwriteDialog.java,v retrieving revision 1.3 diff -u -r1.3 OverwriteDialog.java --- src/modeler/java/org/objectstyle/cayenne/modeler/dialog/OverwriteDialog.java 19 Mar 2005 19:23:50 -0000 1.3 +++ src/modeler/java/org/objectstyle/cayenne/modeler/dialog/OverwriteDialog.java 14 Apr 2005 18:17:27 -0000 @@ -88,7 +88,7 @@ pane.setOptions(OPTIONS); JDialog dialog = pane.createDialog(parent, "File exists"); - dialog.show(); + dialog.setVisible(true); Object selectedValue = pane.getValue(); result = (selectedValue != null) ? selectedValue.toString() : CANCEL; Index: src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java,v retrieving revision 1.10 diff -u -r1.10 ResolveDbRelationshipDialog.java --- src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java 19 Mar 2005 19:23:50 -0000 1.10 +++ src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java 14 Apr 2005 18:17:28 -0000 @@ -251,7 +251,7 @@ public void actionPerformed(ActionEvent e) { cancelPressed = true; - hide(); + setVisible(false); } }); } Index: src/modeler/java/org/objectstyle/cayenne/modeler/dialog/UnsavedChangesDialog.java =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/UnsavedChangesDialog.java,v retrieving revision 1.4 diff -u -r1.4 UnsavedChangesDialog.java --- src/modeler/java/org/objectstyle/cayenne/modeler/dialog/UnsavedChangesDialog.java 19 Mar 2005 19:23:50 -0000 1.4 +++ src/modeler/java/org/objectstyle/cayenne/modeler/dialog/UnsavedChangesDialog.java 14 Apr 2005 18:17:28 -0000 @@ -87,7 +87,7 @@ pane.setOptions(OPTIONS); JDialog dialog = pane.createDialog(parent, "Unsaved Changes"); - dialog.show(); + dialog.setVisible(true); Object selectedValue = pane.getValue(); // need to do an if..else chain, since Index: src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ValidationResultBrowser.java =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ValidationResultBrowser.java,v retrieving revision 1.1 diff -u -r1.1 ValidationResultBrowser.java --- src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ValidationResultBrowser.java 3 Oct 2004 22:16:22 -0000 1.1 +++ src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ValidationResultBrowser.java 14 Apr 2005 18:17:28 -0000 @@ -54,7 +54,7 @@ view.setModal(true); makeCloseableOnEscape(); centerView(); - view.show(); + view.setVisible(true); } /** Index: src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DBGeneratorOptions.java =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DBGeneratorOptions.java,v retrieving revision 1.5 diff -u -r1.5 DBGeneratorOptions.java --- src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DBGeneratorOptions.java 19 Mar 2005 19:23:58 -0000 1.5 +++ src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DBGeneratorOptions.java 14 Apr 2005 18:17:28 -0000 @@ -232,7 +232,7 @@ view.setModal(true); makeCloseableOnEscape(); centerView(); - view.show(); + view.setVisible(true); } public void refreshGeneratorAction() { Index: src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DataSourceWizard.java =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DataSourceWizard.java,v retrieving revision 1.2 diff -u -r1.2 DataSourceWizard.java --- src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DataSourceWizard.java 19 Mar 2005 19:23:57 -0000 1.2 +++ src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DataSourceWizard.java 14 Apr 2005 18:17:28 -0000 @@ -154,7 +154,7 @@ view.setModal(true); makeCloseableOnEscape(); centerView(); - view.show(); + view.setVisible(true); return !canceled; } Index: src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DbLoaderHelper.java =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DbLoaderHelper.java,v retrieving revision 1.10 diff -u -r1.10 DbLoaderHelper.java --- src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DbLoaderHelper.java 19 Mar 2005 19:23:58 -0000 1.10 +++ src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DbLoaderHelper.java 14 Apr 2005 18:17:28 -0000 @@ -185,7 +185,7 @@ SwingUtilities.invokeAndWait(new Runnable() { public void run() { - dialog.show(); + dialog.setVisible(true); dialog.dispose(); } }); @@ -243,8 +243,8 @@ DbLoaderMergeDialog dialog = DbLoaderHelper.getMergeDialogInstance(); dialog.initFromModel(DbLoaderHelper.this, ent.getName()); dialog.centerWindow(); - dialog.show(); - dialog.hide(); + dialog.setVisible(true); + dialog.setVisible(false); } if (stoppingReverseEngineering) { Index: src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DbLoaderMergeDialog.java =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DbLoaderMergeDialog.java,v retrieving revision 1.4 diff -u -r1.4 DbLoaderMergeDialog.java --- src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DbLoaderMergeDialog.java 19 Mar 2005 19:23:57 -0000 1.4 +++ src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DbLoaderMergeDialog.java 14 Apr 2005 18:17:28 -0000 @@ -153,7 +153,7 @@ helper.setStoppingReverseEngineering(stop); } - this.hide(); + this.setVisible(false); } public void initFromModel(DbLoaderHelper helper, String tableName) { Index: src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java,v retrieving revision 1.8 diff -u -r1.8 DbLoaderOptionsDialog.java --- src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java 19 Mar 2005 19:23:57 -0000 1.8 +++ src/modeler/java/org/objectstyle/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java 14 Apr 2005 18:17:28 -0000 @@ -211,12 +211,12 @@ private void processSelect() { choice = SELECT; - hide(); + setVisible(false); } private void processCancel() { choice = CANCEL; - hide(); + setVisible(false); } /** Index: src/modeler/java/org/objectstyle/cayenne/modeler/dialog/pref/DataSourceCreator.java =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/pref/DataSourceCreator.java,v retrieving revision 1.5 diff -u -r1.5 DataSourceCreator.java --- src/modeler/java/org/objectstyle/cayenne/modeler/dialog/pref/DataSourceCreator.java 19 Mar 2005 19:23:55 -0000 1.5 +++ src/modeler/java/org/objectstyle/cayenne/modeler/dialog/pref/DataSourceCreator.java 14 Apr 2005 18:17:28 -0000 @@ -158,7 +158,7 @@ makeCloseableOnEscape(); centerView(); - view.show(); + view.setVisible(true); return createDataSource(); } Index: src/modeler/java/org/objectstyle/cayenne/modeler/dialog/pref/DataSourceDuplicator.java =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/pref/DataSourceDuplicator.java,v retrieving revision 1.2 diff -u -r1.2 DataSourceDuplicator.java --- src/modeler/java/org/objectstyle/cayenne/modeler/dialog/pref/DataSourceDuplicator.java 19 Mar 2005 19:23:55 -0000 1.2 +++ src/modeler/java/org/objectstyle/cayenne/modeler/dialog/pref/DataSourceDuplicator.java 14 Apr 2005 18:17:28 -0000 @@ -151,7 +151,7 @@ makeCloseableOnEscape(); centerView(); - view.show(); + view.setVisible(true); return createDataSource(); } Index: src/modeler/java/org/objectstyle/cayenne/modeler/dialog/pref/PreferenceDialog.java =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/pref/PreferenceDialog.java,v retrieving revision 1.7 diff -u -r1.7 PreferenceDialog.java --- src/modeler/java/org/objectstyle/cayenne/modeler/dialog/pref/PreferenceDialog.java 19 Mar 2005 19:23:54 -0000 1.7 +++ src/modeler/java/org/objectstyle/cayenne/modeler/dialog/pref/PreferenceDialog.java 14 Apr 2005 18:17:28 -0000 @@ -202,7 +202,7 @@ view.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); view.setModal(true); - view.show(); + view.setVisible(true); }