Repository: cayenne Updated Branches: refs/heads/master 9bdc6e90f -> 560086e24
Modeler changes. Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/baba4a61 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/baba4a61 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/baba4a61 Branch: refs/heads/master Commit: baba4a6119f46ccd5a160266cc2ba58d3368c5b1 Parents: 9bdc6e9 Author: Arseni Bulatski <ancars...@gmail.com> Authored: Fri Nov 23 11:18:15 2018 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Fri Nov 23 11:18:15 2018 +0300 ---------------------------------------------------------------------- .../dbimport/ReverseEngineeringToolMenuAction.java | 7 +++---- .../cayenne/modeler/editor/DataDomainTabbedView.java | 7 ++++++- .../cayenne/modeler/editor/cgen/CodeGeneratorPane.java | 12 ++++++++---- 3 files changed, 17 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/baba4a61/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/ReverseEngineeringToolMenuAction.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/ReverseEngineeringToolMenuAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/ReverseEngineeringToolMenuAction.java index 666d906..8efb490 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/ReverseEngineeringToolMenuAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/ReverseEngineeringToolMenuAction.java @@ -19,10 +19,11 @@ package org.apache.cayenne.modeler.action.dbimport; +import org.apache.cayenne.configuration.DataChannelDescriptor; import org.apache.cayenne.modeler.Application; +import org.apache.cayenne.modeler.event.DomainDisplayEvent; import org.apache.cayenne.modeler.util.CayenneAction; -import javax.swing.JOptionPane; import java.awt.event.ActionEvent; /** @@ -39,8 +40,6 @@ public class ReverseEngineeringToolMenuAction extends CayenneAction { @Override public void performAction(ActionEvent e) { - JOptionPane.showMessageDialog(null, "Reverse Engineering was moved to DataMap tabs.\n" + - "You will find new Reverse Engineering in DataMap \u2192 DbImport tab.", DIALOG_TITLE, - JOptionPane.INFORMATION_MESSAGE); + getProjectController().fireDomainDisplayEvent(new DomainDisplayEvent(this, (DataChannelDescriptor) getProjectController().getProject().getRootNode())); } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/baba4a61/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataDomainTabbedView.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataDomainTabbedView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataDomainTabbedView.java index 20741af..b446f23 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataDomainTabbedView.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataDomainTabbedView.java @@ -20,6 +20,7 @@ package org.apache.cayenne.modeler.editor; import org.apache.cayenne.modeler.ProjectController; import org.apache.cayenne.modeler.action.GenerateCodeAction; +import org.apache.cayenne.modeler.action.dbimport.ReverseEngineeringToolMenuAction; import org.apache.cayenne.modeler.editor.cgen.domain.CgenTabController; import org.apache.cayenne.modeler.editor.dbimport.domain.DbImportTabController; import org.apache.cayenne.modeler.event.DomainDisplayEvent; @@ -27,7 +28,8 @@ import org.apache.cayenne.modeler.event.DomainDisplayListener; import org.apache.cayenne.modeler.event.EntityDisplayEvent; import org.apache.cayenne.modeler.graph.DataDomainGraphTab; -import javax.swing.*; +import javax.swing.JScrollPane; +import javax.swing.JTabbedPane; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -107,5 +109,8 @@ public class DataDomainTabbedView extends JTabbedPane if(getSelectedComponent() == dbImportView) { fireStateChanged(); } + if(e.getSource() instanceof ReverseEngineeringToolMenuAction) { + setSelectedComponent(dbImportView); + } } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/baba4a61/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorPane.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorPane.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorPane.java index d563c61..799260e 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorPane.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorPane.java @@ -19,6 +19,8 @@ package org.apache.cayenne.modeler.editor.cgen; +import com.jgoodies.forms.builder.DefaultFormBuilder; +import com.jgoodies.forms.layout.FormLayout; import org.apache.cayenne.modeler.util.ModelerUtil; import javax.swing.JButton; @@ -50,12 +52,14 @@ public class CodeGeneratorPane extends JPanel { this.toolBarPanel = new JPanel(); toolBarPanel.setLayout(new BorderLayout()); + FormLayout layout = new FormLayout( + "fill:110", ""); + DefaultFormBuilder builder = new DefaultFormBuilder(layout); this.generateButton = new JButton("Generate"); - generateButton.setIcon(ModelerUtil.buildIcon("icon-dbi-runImport.png")); + generateButton.setIcon(ModelerUtil.buildIcon("icon-gen_java.png")); generateButton.setEnabled(false); - generateButton.setPreferredSize(new Dimension(115, 25)); - - toolBarPanel.add(generateButton, BorderLayout.EAST); + builder.append(generateButton); + toolBarPanel.add(builder.getPanel(), BorderLayout.EAST); this.checkAll = new JCheckBox(); this.checkAllLabel = new JLabel("Check All Classes");
