Repository: cayenne Updated Branches: refs/heads/master 2894d5ffa -> 2a6ef007b
CAY-1977 | Remove "DbEntity Already Exists" dialog Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/0b2acf6b Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/0b2acf6b Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/0b2acf6b Branch: refs/heads/master Commit: 0b2acf6ba375930ebb6c184b3a874e8b6fae9d2b Parents: 2d8ffba Author: Savva Kolbachev <s.kolbac...@gmail.com> Authored: Fri Dec 5 16:39:58 2014 +0300 Committer: Savva Kolbachev <s.kolbac...@gmail.com> Committed: Fri Dec 5 16:39:58 2014 +0300 ---------------------------------------------------------------------- .../org/apache/cayenne/access/DbLoader.java | 60 +++------ .../apache/cayenne/access/DbLoaderDelegate.java | 8 -- .../access/loader/DefaultDbLoaderDelegate.java | 6 - .../loader/ManyToManyCandidateEntity.java | 8 +- .../cayenne/access/DbLoaderPartialIT.java | 8 +- .../dbimport/DbImportDbLoaderDelegate.java | 13 +- .../dbimport/DbImportDbLoaderDelegateTest.java | 7 - .../modeler/dialog/db/DbLoaderHelper.java | 72 ++-------- .../modeler/dialog/db/DbLoaderMergeDialog.java | 131 ------------------- 9 files changed, 44 insertions(+), 269 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b2acf6b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java index d759213..dec9201 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java @@ -74,12 +74,6 @@ public class DbLoader { public static final String WILDCARD = "%"; public static final String WILDCARD_PATTERN = ".*"; - /** - * CAY-479 - need to track which entities which are skipped during loading from db since it it already present in - * dataMap and haven't marked for overriding so that relationships to non-skipped entities can be loaded - */ - private Set<DbEntity> skippedEntities = new HashSet<DbEntity>(); - private final Connection connection; private final DbAdapter adapter; private final DbLoaderDelegate delegate; @@ -298,27 +292,20 @@ public class DbLoader { // TODO continue? } - try { - if (delegate.overwriteDbEntity(oldEnt)) { - LOGGER.debug("Overwrite: " + oldEnt.getName()); - map.removeDbEntity(oldEnt.getName(), true); - delegate.dbEntityRemoved(oldEnt); - } else { - LOGGER.debug("Keep old: " + oldEnt.getName()); - - // cay-479 - need to track entities that were not loaded for - // relationships exported to entities that were - skippedEntities.add(oldEnt); - continue; + Collection<ObjEntity> oldObjEnt = map.getMappedEntities(oldEnt); + if (!oldObjEnt.isEmpty()) { + for (ObjEntity objEntity : oldObjEnt) { + LOGGER.debug("Delete ObjEntity: " + objEntity.getName()); + map.removeObjEntity(objEntity.getName(), true); + delegate.objEntityRemoved(objEntity); } - } catch (CayenneException ex) { - LOGGER.debug("Load canceled."); - - return null; // cancel immediately } - } + LOGGER.debug("Overwrite DbEntity: " + oldEnt.getName()); + map.removeDbEntity(oldEnt.getName(), true); + delegate.dbEntityRemoved(oldEnt); + } map.addDbEntity(dbEntity); @@ -338,11 +325,6 @@ public class DbLoader { // get primary keys for each table and store it in dbEntity getPrimaryKeysForEachTableAndStoreItInDbEntity(map, tables); - // cay-479 - iterate skipped DbEntities to populate exported keys - for (DbEntity skippedEntity : skippedEntities) { - loadDbRelationships(map, skippedEntity, config); - } - return dbEntityList; } @@ -455,9 +437,9 @@ public class DbLoader { * Creates an ObjEntity for each DbEntity in the map. ObjEntities are * created empty without */ - protected void loadObjEntities(DataMap map, DbLoaderConfiguration config, Collection<DbEntity> entities) { + protected Collection<ObjEntity> loadObjEntities(DataMap map, DbLoaderConfiguration config, Collection<DbEntity> entities) { if (entities.isEmpty()) { - return; + return null; } Collection<ObjEntity> loadedEntities = new ArrayList<ObjEntity>(entities.size()); @@ -489,6 +471,8 @@ public class DbLoader { // update ObjEntity attributes and relationships createEntityMerger(map).synchronizeWithDbEntities(loadedEntities); + + return loadedEntities; } /** @@ -547,9 +531,6 @@ public class DbLoader { if (fkEntity == null) { LOGGER.info("FK warning: no entity found for name '" + fkEntityName + "'"); - } else if (skippedEntities.contains(entity) && skippedEntities.contains(fkEntity)) { - // cay-479 - don't doLoad relationships between two skipped entities. - continue; } else { // init relationship forwardRelationship = new DbRelationship(generateName(entity, key, true)); @@ -643,7 +624,7 @@ public class DbLoader { /** * Flattens many-to-many relationships in the generated model. */ - private void flattenManyToManyRelationships(DataMap map) { + private void flattenManyToManyRelationships(DataMap map, Collection<ObjEntity> loadedObjEntities) { Collection<ObjEntity> entitiesForDelete = new LinkedList<ObjEntity>(); for (ObjEntity curEntity : map.getObjEntities()) { @@ -659,10 +640,11 @@ public class DbLoader { for (ObjEntity curDeleteEntity : entitiesForDelete) { map.removeObjEntity(curDeleteEntity.getName(), true); } + loadedObjEntities.removeAll(entitiesForDelete); } - private void fireObjEntitiesAddedEvents(DataMap map) { - for (ObjEntity curEntity : map.getObjEntities()) { + private void fireObjEntitiesAddedEvents(Collection<ObjEntity> loadedObjEntities) { + for (ObjEntity curEntity : loadedObjEntities) { // notify delegate if (delegate != null) { delegate.objEntityAdded(curEntity); @@ -760,10 +742,10 @@ public class DbLoader { if (entities != null) { loadDbRelationships(dataMap, config, entities); - loadObjEntities(dataMap, config, entities); + Collection<ObjEntity> loadedObjEntities = loadObjEntities(dataMap, config, entities); - flattenManyToManyRelationships(dataMap); - fireObjEntitiesAddedEvents(dataMap); + flattenManyToManyRelationships(dataMap, loadedObjEntities); + fireObjEntitiesAddedEvents(loadedObjEntities); } loadProcedures(dataMap, config); http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b2acf6b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderDelegate.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderDelegate.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderDelegate.java index c1e457a..1919c46 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderDelegate.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderDelegate.java @@ -19,7 +19,6 @@ package org.apache.cayenne.access; -import org.apache.cayenne.CayenneException; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.ObjEntity; @@ -30,13 +29,6 @@ import org.apache.cayenne.map.ObjEntity; */ public interface DbLoaderDelegate { - /** - * Returns true to tell DbLoader that it is OK to overwrite DbEntity that - * already exists in the model. If loading process should be stopped - * immediately, an exception is thrown. - */ - boolean overwriteDbEntity(DbEntity entity) throws CayenneException; - void dbEntityAdded(DbEntity entity); void dbEntityRemoved(DbEntity entity); http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b2acf6b/cayenne-server/src/main/java/org/apache/cayenne/access/loader/DefaultDbLoaderDelegate.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/loader/DefaultDbLoaderDelegate.java b/cayenne-server/src/main/java/org/apache/cayenne/access/loader/DefaultDbLoaderDelegate.java index bc91162..1e8a593 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/loader/DefaultDbLoaderDelegate.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/loader/DefaultDbLoaderDelegate.java @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.cayenne.access.loader; -import org.apache.cayenne.CayenneException; import org.apache.cayenne.access.DbLoaderDelegate; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.ObjEntity; @@ -29,11 +28,6 @@ import org.apache.cayenne.map.ObjEntity; public class DefaultDbLoaderDelegate implements DbLoaderDelegate { @Override - public boolean overwriteDbEntity(DbEntity entity) throws CayenneException { - return false; - } - - @Override public void dbEntityAdded(DbEntity entity) { } http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b2acf6b/cayenne-server/src/main/java/org/apache/cayenne/access/loader/ManyToManyCandidateEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/loader/ManyToManyCandidateEntity.java b/cayenne-server/src/main/java/org/apache/cayenne/access/loader/ManyToManyCandidateEntity.java index 6e392d8..1e94cc3 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/loader/ManyToManyCandidateEntity.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/loader/ManyToManyCandidateEntity.java @@ -18,9 +18,6 @@ ****************************************************************/ package org.apache.cayenne.access.loader; -import java.util.ArrayList; -import java.util.List; - import org.apache.cayenne.map.DbRelationship; import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.map.ObjRelationship; @@ -31,6 +28,9 @@ import org.apache.cayenne.map.naming.ObjectNameGenerator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.ArrayList; +import java.util.List; + /** * Class represent ObjEntity that may be optimized using flattened relationships * as many to many table @@ -72,7 +72,7 @@ public class ManyToManyCandidateEntity { */ public static ManyToManyCandidateEntity build(ObjEntity joinEntity) { ArrayList<ObjRelationship> relationships = new ArrayList<ObjRelationship>(joinEntity.getRelationships()); - if (relationships.size() != 2) { + if (relationships.size() != 2 || (relationships.get(0).getDbRelationships().isEmpty() || relationships.get(1).getDbRelationships().isEmpty())) { return null; } http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b2acf6b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java index 2a56b88..ec4550d 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java @@ -54,13 +54,7 @@ public class DbLoaderPartialIT extends ServerCase { loader = new DbLoader( dataSourceFactory.getSharedDataSource().getConnection(), adapter, - new DefaultDbLoaderDelegate() { - - public boolean overwriteDbEntity(DbEntity ent) throws CayenneException { - return !(ent.getName().equalsIgnoreCase("ARTIST") - || ent.getName().equalsIgnoreCase("PAINTING")); - } - }); + new DefaultDbLoaderDelegate()); } @After http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b2acf6b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java index af1bf26..3ff918e 100644 --- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java +++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java @@ -19,15 +19,14 @@ package org.apache.cayenne.tools.dbimport; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.apache.cayenne.CayenneException; import org.apache.cayenne.access.DbLoaderDelegate; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.ObjEntity; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + /** * @since 4.0 */ @@ -45,10 +44,6 @@ class DbImportDbLoaderDelegate implements DbLoaderDelegate { removedObjEntities = new ArrayList<ObjEntity>(); } - public boolean overwriteDbEntity(DbEntity ent) throws CayenneException { - return false; - } - public void dbEntityAdded(DbEntity ent) { ent.getDataMap().addDbEntity(ent); addedDbEntities.add(ent); http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b2acf6b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegateTest.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegateTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegateTest.java index 7614dbc..52bae8a 100644 --- a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegateTest.java +++ b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegateTest.java @@ -19,7 +19,6 @@ package org.apache.cayenne.tools.dbimport; -import org.apache.cayenne.CayenneException; import org.apache.cayenne.map.DataMap; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.ObjEntity; @@ -30,7 +29,6 @@ import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; public class DbImportDbLoaderDelegateTest { @@ -53,11 +51,6 @@ public class DbImportDbLoaderDelegateTest { } @Test - public void testOverwriteDbEntity() throws CayenneException { - assertFalse(delegate.overwriteDbEntity(dbEntity)); - } - - @Test public void testDbEntityAdded() { delegate.dbEntityAdded(dbEntity); http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b2acf6b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java index 64fc8c6..0cfbbe2 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java @@ -19,18 +19,6 @@ package org.apache.cayenne.modeler.dialog.db; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -import javax.swing.JFrame; -import javax.swing.JOptionPane; -import javax.swing.SwingUtilities; - -import org.apache.cayenne.CayenneException; import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.access.DbLoader; import org.apache.cayenne.access.DbLoaderDelegate; @@ -60,6 +48,16 @@ import org.apache.cayenne.util.Util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.JFrame; +import javax.swing.JOptionPane; +import javax.swing.SwingUtilities; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + import static org.apache.cayenne.access.loader.filters.FilterFactory.NULL; /** @@ -75,10 +73,6 @@ public class DbLoaderHelper { // preferences... private static final Collection<String> EXCLUDED_TABLES = Arrays.asList("AUTO_PK_SUPPORT", "auto_pk_support"); - static DbLoaderMergeDialog mergeDialog; - - protected boolean overwritePreferenceSet; - protected boolean overwritingEntities; protected boolean stoppingReverseEngineering; protected boolean existingMap; @@ -98,40 +92,16 @@ public class DbLoaderHelper { */ protected List<ObjEntity> addedObjEntities; - static DbLoaderMergeDialog getMergeDialogInstance() { - if (mergeDialog == null) { - mergeDialog = new DbLoaderMergeDialog(Application.getFrame()); - } - - return mergeDialog; - } - public DbLoaderHelper(ProjectController mediator, Connection connection, DbAdapter adapter, String dbUserName) { this.dbUserName = dbUserName; this.mediator = mediator; this.loader = new DbLoader(connection, adapter, new LoaderDelegate()); } - public void setOverwritingEntities(boolean overwritePreference) { - this.overwritingEntities = overwritePreference; - } - - public void setOverwritePreferenceSet(boolean overwritePreferenceSet) { - this.overwritePreferenceSet = overwritePreferenceSet; - } - public void setStoppingReverseEngineering(boolean stopReverseEngineering) { this.stoppingReverseEngineering = stopReverseEngineering; } - public boolean isOverwritePreferenceSet() { - return overwritePreferenceSet; - } - - public boolean isOverwritingEntities() { - return overwritingEntities; - } - public boolean isStoppingReverseEngineering() { return stoppingReverseEngineering; } @@ -214,24 +184,7 @@ public class DbLoaderHelper { final class LoaderDelegate implements DbLoaderDelegate { - public boolean overwriteDbEntity(DbEntity ent) throws CayenneException { - checkCanceled(); - - if (!overwritePreferenceSet) { - DbLoaderMergeDialog dialog = DbLoaderHelper.getMergeDialogInstance(); - dialog.initFromModel(DbLoaderHelper.this, ent.getName()); - dialog.centerWindow(); - dialog.setVisible(true); - dialog.setVisible(false); - } - - if (stoppingReverseEngineering) { - throw new CayenneException("Should stop DB import."); - } - - return overwritingEntities; - } - + @Override public void dbEntityAdded(DbEntity entity) { checkCanceled(); @@ -247,6 +200,7 @@ public class DbLoaderHelper { } } + @Override public void objEntityAdded(ObjEntity entity) { checkCanceled(); @@ -258,6 +212,7 @@ public class DbLoaderHelper { } } + @Override public void dbEntityRemoved(DbEntity entity) { checkCanceled(); @@ -266,6 +221,7 @@ public class DbLoaderHelper { } } + @Override public void objEntityRemoved(ObjEntity entity) { checkCanceled(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b2acf6b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderMergeDialog.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderMergeDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderMergeDialog.java deleted file mode 100644 index 2a335af..0000000 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderMergeDialog.java +++ /dev/null @@ -1,131 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - ****************************************************************/ - -package org.apache.cayenne.modeler.dialog.db; - -import java.awt.BorderLayout; -import java.awt.Container; -import java.awt.FlowLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JPanel; - -import org.apache.cayenne.modeler.CayenneModelerFrame; -import org.apache.cayenne.modeler.util.CayenneDialog; -import org.apache.cayenne.modeler.util.PanelFactory; - -/** - */ -public class DbLoaderMergeDialog extends CayenneDialog { - - protected DbLoaderHelper helper; - protected JCheckBox rememberSelection; - protected JLabel message; - protected JButton overwriteButton; - protected JButton skipButton; - protected JButton stopButton; - - public DbLoaderMergeDialog(CayenneModelerFrame owner) { - super(owner); - init(); - initController(); - } - - private void init() { - // create widgets - this.rememberSelection = new JCheckBox("Remember my decision for other entities."); - this.rememberSelection.setSelected(true); - - this.overwriteButton = new JButton("Overwrite"); - this.skipButton = new JButton("Skip"); - this.stopButton = new JButton("Stop"); - this.message = new JLabel("DataMap already contains this table. Overwrite?"); - - // assemble - JPanel messagePanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 20, 20)); - messagePanel.add(message); - - JPanel checkPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 20, 5)); - checkPanel.add(rememberSelection); - - JPanel buttons = PanelFactory.createButtonPanel(new JButton[] { - skipButton, overwriteButton, stopButton - }); - - Container contentPane = getContentPane(); - contentPane.setLayout(new BorderLayout()); - contentPane.add(messagePanel, BorderLayout.NORTH); - contentPane.add(checkPanel, BorderLayout.CENTER); - contentPane.add(buttons, BorderLayout.SOUTH); - - setModal(true); - setResizable(false); - setSize(250, 150); - setTitle("DbEntity Already Exists"); - setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE); - } - - private void initController() { - overwriteButton.addActionListener(new ActionListener() { - - public void actionPerformed(ActionEvent e) { - updateModel(true, false); - } - }); - - skipButton.addActionListener(new ActionListener() { - - public void actionPerformed(ActionEvent e) { - updateModel(false, false); - } - }); - - stopButton.addActionListener(new ActionListener() { - - public void actionPerformed(ActionEvent e) { - updateModel(false, true); - } - }); - } - - private void updateModel(boolean overwrite, boolean stop) { - if (helper != null) { - helper.setOverwritePreferenceSet(rememberSelection.isSelected()); - helper.setOverwritingEntities(overwrite); - helper.setStoppingReverseEngineering(stop); - } - - this.setVisible(false); - } - - public void initFromModel(DbLoaderHelper helper, String tableName) { - this.helper = helper; - this.message.setText("DataMap already contains table '" - + tableName - + "'. Overwrite?"); - - validate(); - pack(); - } -}
