Repository: cayenne Updated Branches: refs/heads/master 781dcce21 -> aa8f88ce3
Update cgen view. Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e6ba48c4 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e6ba48c4 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e6ba48c4 Branch: refs/heads/master Commit: e6ba48c490d8d79ff231c7a8c9fc6d392e8098fe Parents: 9ac7a22 Author: Arseni Bulatski <ancars...@gmail.com> Authored: Wed Nov 21 18:40:11 2018 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Wed Nov 21 18:40:11 2018 +0300 ---------------------------------------------------------------------- .../editor/cgen/ClassesTabController.java | 2 +- .../modeler/editor/cgen/ClassesTabPanel.java | 2 +- .../editor/cgen/CodeGeneratorController.java | 36 -------------------- .../modeler/editor/cgen/CodeGeneratorPane.java | 2 +- .../editor/cgen/GeneratorControllerPanel.java | 2 +- .../modeler/editor/cgen/GeneratorTabPanel.java | 22 ++---------- 6 files changed, 6 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/e6ba48c4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/ClassesTabController.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/ClassesTabController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/ClassesTabController.java index 9032071..fe3dc4d 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/ClassesTabController.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/ClassesTabController.java @@ -74,7 +74,7 @@ public class ClassesTabController extends CayenneController { "parent.getItemName(#item)", JLabel.class, false, - "XXXXXXXXXXXXXX"); + "XXXXXXXXXXXXXXXXXXXXXXXXXXX"); tableBuilder.addColumn( "Comments, Warnings", http://git-wip-us.apache.org/repos/asf/cayenne/blob/e6ba48c4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/ClassesTabPanel.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/ClassesTabPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/ClassesTabPanel.java index 3f5c49c..0cca129 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/ClassesTabPanel.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/ClassesTabPanel.java @@ -68,7 +68,7 @@ public class ClassesTabPanel extends JPanel { // set some minimal preferred size, so that it is smaller than other forms used in // the dialog... this way we get the right automated overall size - tablePanel.setPreferredSize(new Dimension(300, 200)); + tablePanel.setPreferredSize(new Dimension(450, 200)); setLayout(new BorderLayout()); add(topPanel, BorderLayout.NORTH); http://git-wip-us.apache.org/repos/asf/cayenne/blob/e6ba48c4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java index 9db6135..36f88a2 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java @@ -129,42 +129,6 @@ public class CodeGeneratorController extends CodeGeneratorControllerBase impleme } public void classesSelectedAction() { - int size = getSelectedEntitiesSize(); - String label; - - if (size == 0) { - label = "No entities selected"; - } - else if (size == 1) { - label = "One entity selected"; - } - else { - label = size + " entities selected"; - } - - label = label.concat("; "); - - int sizeEmb = getSelectedEmbeddablesSize(); - - if (sizeEmb == 0) { - label = label + "No embeddables selected"; - } - else if (sizeEmb == 1) { - label = label + "One embeddable selected"; - } - else { - label = label + sizeEmb + " embeddables selected"; - } - - label = label.concat("; "); - - if(isDataMapSelected()) { - label = label + "DataMap selected"; - } else { - label = label + "No dataMap selected"; - } - - ((GeneratorTabPanel)generatorSelector.getView()).getClassesCount().setText(label); if(!isInitFromModel()) { getProjectController().setDirty(true); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/e6ba48c4/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 003d850..3875391 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 @@ -39,7 +39,7 @@ public class CodeGeneratorPane extends JSplitPane { generatorPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); - scrollPane.setPreferredSize(new Dimension(800, 400)); + scrollPane.setPreferredSize(new Dimension(300,400)); // assemble splitPane.setRightComponent(scrollPane); http://git-wip-us.apache.org/repos/asf/cayenne/blob/e6ba48c4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/GeneratorControllerPanel.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/GeneratorControllerPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/GeneratorControllerPanel.java index 3275726..40c0cf3 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/GeneratorControllerPanel.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/GeneratorControllerPanel.java @@ -50,7 +50,7 @@ public class GeneratorControllerPanel extends JPanel { } } }; - this.selectOutputFolder = new JButton("Select"); + this.selectOutputFolder = new JButton(".."); } public TextAdapter getOutputFolder() { http://git-wip-us.apache.org/repos/asf/cayenne/blob/e6ba48c4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/GeneratorTabPanel.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/GeneratorTabPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/GeneratorTabPanel.java index a10fe21..49e0db7 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/GeneratorTabPanel.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/GeneratorTabPanel.java @@ -24,16 +24,8 @@ import com.jgoodies.forms.layout.FormLayout; import org.apache.cayenne.modeler.util.ModelerUtil; import org.apache.cayenne.swing.components.TopBorder; -import javax.swing.Box; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JLabel; -import javax.swing.JPanel; -import java.awt.BorderLayout; -import java.awt.CardLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.FlowLayout; +import javax.swing.*; +import java.awt.*; import java.util.Objects; /** @@ -46,7 +38,6 @@ public class GeneratorTabPanel extends JPanel { private JPanel modesPanel; private JButton generateButton; - private JLabel classesCount; public GeneratorTabPanel(String[] modeNames, Component[] modePanels) { setLayout(new BorderLayout()); @@ -54,13 +45,8 @@ public class GeneratorTabPanel extends JPanel { generateButton.setIcon(ModelerUtil.buildIcon("icon-gen_java.png")); generateButton.setPreferredSize(new Dimension(180, 30)); generateButton.setEnabled(false); - this.classesCount = new JLabel("No classes selected"); - classesCount.setFont(classesCount.getFont().deriveFont(10f)); - JPanel messages = new JPanel(new BorderLayout()); - messages.add(classesCount, BorderLayout.WEST); JPanel buttons = new JPanel(new FlowLayout(FlowLayout.RIGHT)); buttons.setBorder(TopBorder.create()); - buttons.add(classesCount); buttons.add(Box.createHorizontalStrut(50)); buttons.add(generateButton); add(buttons, BorderLayout.NORTH); @@ -97,8 +83,4 @@ public class GeneratorTabPanel extends JPanel { public JButton getGenerateButton() { return generateButton; } - - public JLabel getClassesCount() { - return classesCount; - } }
