You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/11/23 08:00:35 UTC
[1/2] cayenne git commit: Update cgen and dbImport tabs in project
tab.
Repository: cayenne
Updated Branches:
refs/heads/master 86396c9f4 -> 9bdc6e90f
Update cgen and dbImport tabs in project tab.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b39292b8
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b39292b8
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b39292b8
Branch: refs/heads/master
Commit: b39292b8900cd1a5490420a2ea5a54fce08f1438
Parents: 86396c9
Author: Arseni Bulatski <an...@gmail.com>
Authored: Fri Nov 23 10:18:17 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Fri Nov 23 10:18:17 2018 +0300
----------------------------------------------------------------------
.../cayenne/modeler/editor/GeneratorsPanel.java | 25 ++-------
.../cayenne/modeler/editor/GeneratorsTab.java | 58 ++++++++++++--------
.../modeler/editor/GeneratorsTabController.java | 9 +--
.../modeler/editor/cgen/domain/CgenTab.java | 2 +-
.../editor/cgen/domain/CgenTabController.java | 5 --
.../editor/dbimport/domain/DbImportTab.java | 2 +-
.../dbimport/domain/DbImportTabController.java | 16 ------
7 files changed, 44 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b39292b8/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsPanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsPanel.java
index d0de082..5ea2242 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsPanel.java
@@ -40,7 +40,6 @@ public class GeneratorsPanel extends JPanel {
private JCheckBox checkConfig;
private JLabel dataMapLabel;
private JButton toConfigButton;
- private JButton deleteButton;
private DataMap dataMap;
private Class type;
private String icon;
@@ -55,28 +54,20 @@ public class GeneratorsPanel extends JPanel {
public void initView(){
setLayout(new BorderLayout());
FormLayout layout = new FormLayout(
- "left:pref, 4dlu, fill:50dlu, 3dlu, fill:120, 3dlu, fill:120", "");
+ "left:pref, 4dlu, fill:70dlu, 3dlu, fill:120, 3dlu, fill:120", "");
DefaultFormBuilder builder = new DefaultFormBuilder(layout);
- builder.setDefaultDialogBorder();
-
this.checkConfig = new JCheckBox();
this.dataMapLabel = new JLabel(dataMap.getName());
+ this.dataMapLabel.setToolTipText(dataMap.getName());
DataChannelMetaData metaData = Application.getInstance().getMetaData();
- this.toConfigButton = new JButton();
- this.deleteButton = new JButton("Delete config");
- if(metaData.get(dataMap, type) != null) {
- this.toConfigButton.setText("Edit Config");
- } else {
- this.toConfigButton.setText("Create Config");
+ this.toConfigButton = new JButton("Edit Config");
+ if(metaData.get(dataMap, type) == null) {
if(type == ReverseEngineering.class) {
checkConfig.setEnabled(false);
}
}
this.toConfigButton.setIcon(ModelerUtil.buildIcon(icon));
builder.append(checkConfig, dataMapLabel, toConfigButton);
- if(type == ReverseEngineering.class) {
- builder.append(deleteButton);
- }
this.add(builder.getPanel(), BorderLayout.CENTER);
}
@@ -88,14 +79,6 @@ public class GeneratorsPanel extends JPanel {
return toConfigButton;
}
- public JButton getDeleteButton() {
- return deleteButton;
- }
-
- public JLabel getDataMapLabel() {
- return dataMapLabel;
- }
-
public DataMap getDataMap() {
return dataMap;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b39292b8/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsTab.java
index 4e8cf65..611905f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsTab.java
@@ -30,8 +30,6 @@ import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentMap;
@@ -44,18 +42,14 @@ public class GeneratorsTab extends JPanel {
protected ProjectController projectController;
private GeneratorsTabController additionalTabController;
- private JCheckBox selectAll;
- private JButton generateAll;
+ private TopGeneratorPanel generationPanel;
- public GeneratorsTab(ProjectController projectController, GeneratorsTabController additionalTabController, String icon) {
+ public GeneratorsTab(ProjectController projectController, GeneratorsTabController additionalTabController, String icon, String text) {
this.projectController = projectController;
this.additionalTabController = additionalTabController;
- this.selectAll = new JCheckBox();
- generateAll = new JButton("Run");
- generateAll.setEnabled(false);
- generateAll.setIcon(ModelerUtil.buildIcon(icon));
- generateAll.setPreferredSize(new Dimension(120, 30));
- generateAll.addActionListener(action -> additionalTabController.runGenerators(additionalTabController.getSelectedDataMaps()));
+ this.generationPanel = new TopGeneratorPanel(icon);
+ this.generationPanel.generateAll.addActionListener(action -> additionalTabController.runGenerators(additionalTabController.getSelectedDataMaps()));
+ this.generationPanel.generateAll.setToolTipText(text);
setLayout(new BorderLayout());
}
@@ -63,28 +57,23 @@ public class GeneratorsTab extends JPanel {
removeAll();
additionalTabController.createPanels();
FormLayout layout = new FormLayout(
- "left:pref, 4dlu, 50dlu", "");
+ "left:pref, 4dlu", "");
DefaultFormBuilder builder = new DefaultFormBuilder(layout);
builder.setDefaultDialogBorder();
ConcurrentMap<DataMap, GeneratorsPanel> panels = additionalTabController.getGeneratorsPanels();
if(panels.isEmpty()) {
- this.add(new JLabel("There are no configs."), BorderLayout.NORTH);
+ this.add(new JLabel("There are no datamaps."), BorderLayout.NORTH);
return;
}
- JPanel selectAllPanel = new JPanel(new FlowLayout());
- selectAllPanel.add(new JLabel("Select All"), FlowLayout.LEFT);
- selectAllPanel.add(selectAll, FlowLayout.CENTER);
- builder.append(selectAllPanel);
+ builder.append(generationPanel);
builder.nextLine();
-
SortedSet<DataMap> keys = new TreeSet<>(panels.keySet());
for(DataMap dataMap : keys) {
builder.append(panels.get(dataMap));
builder.nextLine();
}
- builder.append(generateAll);
this.add(builder.getPanel(), BorderLayout.CENTER);
}
@@ -94,11 +83,34 @@ public class GeneratorsTab extends JPanel {
"Nothing to generate");
}
- public JCheckBox getSelectAll() {
- return selectAll;
+ TopGeneratorPanel getGenerationPanel() {
+ return generationPanel;
}
- public JButton getGenerateAll() {
- return generateAll;
+ class TopGeneratorPanel extends JPanel {
+
+ private JCheckBox selectAll;
+ JButton generateAll;
+
+ TopGeneratorPanel(String icon) {
+ setLayout(new BorderLayout());
+ FormLayout layout = new FormLayout(
+ "left:pref, 4dlu, fill:70dlu, 3dlu, fill:120, 3dlu, fill:120", "");
+ DefaultFormBuilder builder = new DefaultFormBuilder(layout);
+ this.selectAll = new JCheckBox();
+ generateAll = new JButton("Run");
+ generateAll.setEnabled(false);
+ generateAll.setIcon(ModelerUtil.buildIcon(icon));
+ builder.append(selectAll, new JLabel("Select All"), generateAll);
+ this.add(builder.getPanel(), BorderLayout.CENTER);
+ }
+
+ JCheckBox getSelectAll() {
+ return selectAll;
+ }
+
+ JButton getGenerateAll() {
+ return generateAll;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b39292b8/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsTabController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsTabController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsTabController.java
index 847bd59..a257643 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsTabController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsTabController.java
@@ -83,9 +83,8 @@ public abstract class GeneratorsTabController {
});
panel.getToConfigButton().addActionListener(action -> showConfig(panel.getDataMap()));
- panel.getDeleteButton().addActionListener(action -> deleteConfig(panel.getDataMap()));
- view.getSelectAll().addItemListener(e -> {
+ view.getGenerationPanel().getSelectAll().addItemListener(e -> {
if(e.getStateChange() == ItemEvent.SELECTED) {
getGeneratorsPanels().forEach((key, value) -> {
if (value.getCheckConfig().isEnabled()) {
@@ -105,13 +104,11 @@ public abstract class GeneratorsTabController {
public abstract void showConfig(DataMap dataMap);
- public abstract void deleteConfig(DataMap dataMap);
-
private void setGenerateButtonDisabled() {
if(selectedDataMaps.size() == 0) {
- view.getGenerateAll().setEnabled(false);
+ view.getGenerationPanel().getGenerateAll().setEnabled(false);
} else {
- view.getGenerateAll().setEnabled(true);
+ view.getGenerationPanel().getGenerateAll().setEnabled(true);
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b39292b8/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTab.java
index ab913d3..40c7064 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTab.java
@@ -31,7 +31,7 @@ import javax.swing.JOptionPane;
public class CgenTab extends GeneratorsTab {
public CgenTab(ProjectController projectController, GeneratorsTabController additionalTabController) {
- super(projectController, additionalTabController, "icon-gen_java.png");
+ super(projectController, additionalTabController, "icon-gen_java.png", "Run class generation on selected datamaps.");
}
void showSuccessMessage() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b39292b8/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
index eab60fa..ff68804 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
@@ -122,9 +122,4 @@ public class CgenTabController extends GeneratorsTabController {
projectController.fireDataMapDisplayEvent(new DataMapDisplayEvent(this.getView(), dataMap, dataMap.getDataChannelDescriptor()));
}
}
-
- @Override
- public void deleteConfig(DataMap dataMap) {
- //NOOP
- }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b39292b8/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/domain/DbImportTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/domain/DbImportTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/domain/DbImportTab.java
index 14ca9af..25313cf 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/domain/DbImportTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/domain/DbImportTab.java
@@ -28,7 +28,7 @@ import org.apache.cayenne.modeler.editor.GeneratorsTabController;
public class DbImportTab extends GeneratorsTab {
public DbImportTab(ProjectController projectController, GeneratorsTabController additionalTabController) {
- super(projectController, additionalTabController, "icon-dbi-runImport.png");
+ super(projectController, additionalTabController, "icon-dbi-runImport.png", "Run reverse engineering on selected datamaps.");
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b39292b8/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/domain/DbImportTabController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/domain/DbImportTabController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/domain/DbImportTabController.java
index c65529b..b5dad5a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/domain/DbImportTabController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/domain/DbImportTabController.java
@@ -18,14 +18,12 @@
****************************************************************/
package org.apache.cayenne.modeler.editor.dbimport.domain;
-import org.apache.cayenne.configuration.xml.DataChannelMetaData;
import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.action.ReverseEngineeringAction;
import org.apache.cayenne.modeler.editor.GeneratorsTabController;
-import org.apache.cayenne.modeler.editor.GeneratorsPanel;
import org.apache.cayenne.modeler.event.DataMapDisplayEvent;
import java.util.Set;
@@ -61,18 +59,4 @@ public class DbImportTabController extends GeneratorsTabController {
projectController.fireDataMapDisplayEvent(new DataMapDisplayEvent(this.getView(), dataMap, dataMap.getDataChannelDescriptor()));
}
}
-
- @Override
- public void deleteConfig(DataMap dataMap) {
- DataChannelMetaData metaData = Application.getInstance().getMetaData();
- if(metaData != null) {
- ReverseEngineering reverseEngineering = metaData.remove(dataMap, ReverseEngineering.class);
- if(reverseEngineering != null) {
- GeneratorsPanel tabPanel = generatorsPanels.get(dataMap);
- tabPanel.getToConfigButton().setText("Create Config");
- tabPanel.getCheckConfig().setEnabled(false);
- tabPanel.getCheckConfig().setSelected(false);
- }
- }
- }
}
[2/2] cayenne git commit: Merge PR #351
Posted by nt...@apache.org.
Merge PR #351
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9bdc6e90
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9bdc6e90
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9bdc6e90
Branch: refs/heads/master
Commit: 9bdc6e90f4181f76950da60e2808e027cae5ea80
Parents: 86396c9 b39292b
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Nov 23 10:55:24 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Nov 23 10:55:24 2018 +0300
----------------------------------------------------------------------
.../cayenne/modeler/editor/GeneratorsPanel.java | 25 ++-------
.../cayenne/modeler/editor/GeneratorsTab.java | 58 ++++++++++++--------
.../modeler/editor/GeneratorsTabController.java | 9 +--
.../modeler/editor/cgen/domain/CgenTab.java | 2 +-
.../editor/cgen/domain/CgenTabController.java | 5 --
.../editor/dbimport/domain/DbImportTab.java | 2 +-
.../dbimport/domain/DbImportTabController.java | 16 ------
7 files changed, 44 insertions(+), 73 deletions(-)
----------------------------------------------------------------------