[GitHub] cayenne pull request #351: Update cgen and dbImport tabs in project tab.
GitHub user aarrsseni opened a pull request: https://github.com/apache/cayenne/pull/351 Update cgen and dbImport tabs in project tab. You can merge this pull request into a Git repository by running: $ git pull https://github.com/aarrsseni/cayenne project-generators-update Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cayenne/pull/351.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #351 commit b39292b8900cd1a5490420a2ea5a54fce08f1438 Author: Arseni Bulatski Date: 2018-11-23T07:18:17Z Update cgen and dbImport tabs in project tab. ---
[GitHub] cayenne pull request #349: Add dbImport tab on dataDomain view.
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/349 ---
[4/4] cayenne git commit: Merge PR #349
Merge PR #349 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/86396c9f Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/86396c9f Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/86396c9f Branch: refs/heads/master Commit: 86396c9f400ceffc1ae8c3e99b667fe21eae63db Parents: aa8f88c 5fd1aa1 Author: Nikita Timofeev Authored: Thu Nov 22 16:58:59 2018 +0300 Committer: Nikita Timofeev Committed: Thu Nov 22 16:58:59 2018 +0300 -- .../configuration/xml/DataChannelMetaData.java | 9 ++ .../xml/DefaultDataChannelMetaData.java | 25 +++- .../xml/NoopDataChannelMetaData.java| 5 + .../modeler/CayenneModelerController.java | 8 ++ .../cayenne/modeler/ProjectController.java | 6 +- .../apache/cayenne/modeler/ProjectTreeView.java | 4 +- .../action/ReverseEngineeringAction.java| 56 .../dialog/db/load/DbLoadResultDialog.java | 96 + .../dialog/db/load/ModelerDbImportAction.java | 46 +-- .../modeler/editor/DataDomainTabbedView.java| 18 ++- .../modeler/editor/DataMapTabbedView.java | 9 +- .../cayenne/modeler/editor/GeneratorsPanel.java | 102 ++ .../cayenne/modeler/editor/GeneratorsTab.java | 104 ++ .../modeler/editor/GeneratorsTabController.java | 138 +++ .../editor/GlobalDbImportController.java| 77 +++ .../modeler/editor/cgen/domain/CgenPanel.java | 84 --- .../modeler/editor/cgen/domain/CgenTab.java | 78 +-- .../editor/cgen/domain/CgenTabController.java | 102 ++ .../modeler/editor/dbimport/DbImportView.java | 17 ++- .../editor/dbimport/TreeToolbarPanel.java | 6 +- .../editor/dbimport/domain/DbImportTab.java | 34 + .../dbimport/domain/DbImportTabController.java | 78 +++ 22 files changed, 771 insertions(+), 331 deletions(-) --
[1/4] cayenne git commit: Adding dbImport tab to project tab
Repository: cayenne
Updated Branches:
refs/heads/master aa8f88ce3 -> 86396c9f4
Adding dbImport tab to project tab
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2ee1782c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2ee1782c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2ee1782c
Branch: refs/heads/master
Commit: 2ee1782cad651e355d2653030a47a4e01b6d00b7
Parents: b580bda
Author: Arseni Bulatski
Authored: Thu Nov 15 09:32:17 2018 +0300
Committer: Arseni Bulatski
Committed: Thu Nov 15 09:32:17 2018 +0300
--
.../cayenne/modeler/editor/AdditionalTab.java | 71 +
.../modeler/editor/AdditionalTabController.java | 100 +++
.../apache/cayenne/modeler/editor/TabPanel.java | 59 +++
.../modeler/editor/cgen/domain/CgenPanel.java | 84
.../modeler/editor/cgen/domain/CgenTab.java | 74 ++
.../editor/cgen/domain/CgenTabController.java | 100 ++-
6 files changed, 245 insertions(+), 243 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2ee1782c/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AdditionalTab.java
--
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AdditionalTab.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AdditionalTab.java
new file mode 100644
index 000..3e5bafa
--- /dev/null
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AdditionalTab.java
@@ -0,0 +1,71 @@
+package org.apache.cayenne.modeler.editor;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+import com.jgoodies.forms.layout.FormLayout;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.modeler.ProjectController;
+import org.apache.cayenne.modeler.util.ModelerUtil;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.concurrent.ConcurrentMap;
+
+public class AdditionalTab extends JPanel {
+
+protected ProjectController projectController;
+private AdditionalTabController additionalTabController;
+
+private JCheckBox selectAll;
+private JButton generateAll;
+
+public AdditionalTab(ProjectController projectController,
AdditionalTabController additionalTabController, String icon) {
+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()));
+setLayout(new BorderLayout());
+}
+
+public void initView() {
+removeAll();
+additionalTabController.createPanels();
+FormLayout layout = new FormLayout(
+"left:pref, 4dlu, 50dlu", "");
+DefaultFormBuilder builder = new DefaultFormBuilder(layout);
+builder.setDefaultDialogBorder();
+ConcurrentMap panels =
additionalTabController.getGeneratorsPanels();
+
+if(panels.isEmpty()) {
+this.add(new JLabel("There are no configs."), 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.nextLine();
+
+SortedSet 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);
+}
+
+public JCheckBox getSelectAll() {
+return selectAll;
+}
+
+public JButton getGenerateAll() {
+return generateAll;
+}
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2ee1782c/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AdditionalTabController.java
--
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AdditionalTabController.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AdditionalTabController.java
new file mode 100644
index 000..80d08ad
--- /dev/null
+++
[3/4] cayenne git commit: Some fixes
Some fixes Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5fd1aa19 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5fd1aa19 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5fd1aa19 Branch: refs/heads/master Commit: 5fd1aa19c02cfbf78edbd0e422c468b3ed27c8d1 Parents: 5a0b4a7 Author: Arseni Bulatski Authored: Thu Nov 22 16:40:07 2018 +0300 Committer: Arseni Bulatski Committed: Thu Nov 22 16:55:31 2018 +0300 -- .../cayenne/modeler/CayenneModelerController.java | 4 ++-- .../org/apache/cayenne/modeler/ProjectController.java | 12 ++-- .../modeler/action/ReverseEngineeringAction.java | 3 ++- .../modeler/dialog/db/load/DbLoadResultDialog.java | 13 +++-- .../modeler/dialog/db/load/ModelerDbImportAction.java | 3 ++- .../apache/cayenne/modeler/editor/GeneratorsTab.java | 10 -- .../modeler/editor/GlobalDbImportController.java | 4 ++-- .../cayenne/modeler/editor/cgen/domain/CgenTab.java| 2 +- .../modeler/editor/cgen/domain/CgenTabController.java | 2 +- .../cayenne/modeler/editor/dbimport/DbImportView.java | 10 -- 10 files changed, 47 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5fd1aa19/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java -- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java index 3d3e93c..e92d27a 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java @@ -35,9 +35,9 @@ import org.apache.cayenne.project.validation.ProjectValidator; import org.apache.cayenne.validation.ValidationFailure; import org.apache.cayenne.validation.ValidationResult; -import javax.swing.*; +import javax.swing.WindowConstants; import javax.swing.filechooser.FileFilter; -import java.awt.*; +import java.awt.Component; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.dnd.DropTarget; http://git-wip-us.apache.org/repos/asf/cayenne/blob/5fd1aa19/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java -- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java index 3dc2b3a..b385d75 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java @@ -116,9 +116,17 @@ import org.apache.cayenne.project.Project; import org.apache.cayenne.util.IDUtil; import javax.swing.event.EventListenerList; -import java.awt.*; -import java.util.*; +import java.awt.Component; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.EventListener; +import java.util.EventObject; +import java.util.HashSet; +import java.util.Iterator; import java.util.List; +import java.util.Set; import java.util.prefs.Preferences; /** http://git-wip-us.apache.org/repos/asf/cayenne/blob/5fd1aa19/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java -- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java index 63e2ffb..3146384 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java @@ -30,7 +30,8 @@ import org.apache.cayenne.modeler.editor.dbimport.DbImportView; import org.apache.cayenne.modeler.pref.DBConnectionInfo; import org.apache.cayenne.modeler.pref.DataMapDefaults; -import javax.swing.*; +import javax.swing.JOptionPane; +import javax.swing.SwingUtilities; import java.awt.event.ActionEvent; import java.sql.SQLException; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/cayenne/blob/5fd1aa19/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java
[2/4] cayenne git commit: Add dbImport on dataDomain tab
Add dbImport on dataDomain tab
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5a0b4a76
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5a0b4a76
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5a0b4a76
Branch: refs/heads/master
Commit: 5a0b4a76b8232a8e85f8505c0ceb64fa11f9ea6c
Parents: 2ee1782
Author: Arseni Bulatski
Authored: Wed Nov 21 17:35:23 2018 +0300
Committer: Arseni Bulatski
Committed: Wed Nov 21 17:49:11 2018 +0300
--
.../configuration/xml/DataChannelMetaData.java | 9 ++
.../xml/DefaultDataChannelMetaData.java | 25 +++-
.../xml/NoopDataChannelMetaData.java| 5 +
.../modeler/CayenneModelerController.java | 12 +-
.../cayenne/modeler/ProjectController.java | 18 +--
.../apache/cayenne/modeler/ProjectTreeView.java | 4 +-
.../action/ReverseEngineeringAction.java| 55
.../dialog/db/load/DbLoadResultDialog.java | 101 +-
.../dialog/db/load/ModelerDbImportAction.java | 49 +--
.../cayenne/modeler/editor/AdditionalTab.java | 71 --
.../modeler/editor/AdditionalTabController.java | 100 --
.../modeler/editor/DataDomainTabbedView.java| 18 ++-
.../modeler/editor/DataMapTabbedView.java | 9 +-
.../cayenne/modeler/editor/GeneratorsPanel.java | 102 ++
.../cayenne/modeler/editor/GeneratorsTab.java | 98 +
.../modeler/editor/GeneratorsTabController.java | 138 +++
.../editor/GlobalDbImportController.java| 77 +++
.../apache/cayenne/modeler/editor/TabPanel.java | 59
.../modeler/editor/cgen/domain/CgenTab.java | 14 +-
.../editor/cgen/domain/CgenTabController.java | 16 ++-
.../modeler/editor/dbimport/DbImportView.java | 25 ++--
.../editor/dbimport/TreeToolbarPanel.java | 6 +-
.../editor/dbimport/domain/DbImportTab.java | 34 +
.../dbimport/domain/DbImportTabController.java | 78 +++
24 files changed, 765 insertions(+), 358 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5a0b4a76/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelMetaData.java
--
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelMetaData.java
b/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelMetaData.java
index 3e0cd20..a54219b 100644
---
a/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelMetaData.java
+++
b/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelMetaData.java
@@ -61,4 +61,13 @@ public interface DataChannelMetaData {
* @return value or {@code null} if no data available
*/
T get(ConfigurationNode key, Class type);
+
+/**
+ * @since 4.1
+ * @param key object for wich we want meta data
+ * @param type meta data type class
+ * @param meta data type
+ * @return value or {@code null} if no can't remove
+ */
+ T remove(ConfigurationNode key, Class type);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5a0b4a76/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DefaultDataChannelMetaData.java
--
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DefaultDataChannelMetaData.java
b/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DefaultDataChannelMetaData.java
index 869abed..26be7db 100644
---
a/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DefaultDataChannelMetaData.java
+++
b/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DefaultDataChannelMetaData.java
@@ -19,11 +19,11 @@
package org.apache.cayenne.configuration.xml;
+import org.apache.cayenne.configuration.ConfigurationNode;
+
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.cayenne.configuration.ConfigurationNode;
-
/**
*
* Default implementation of {@link DataChannelMetaData} that stores data
in Map.
@@ -88,4 +88,25 @@ public class DefaultDataChannelMetaData implements
DataChannelMetaData {
return type.cast(data.get(type));
}
+
+/**
+ *
+ * @param key object for wich we want meta data
+ * @param type meta data type class
+ * @param data type
+ * @return removed value or {@code null}
+ */
+@Override
+public T remove(ConfigurationNode key, Class type) {
+if(key == null || type == null) {
+return null;
+}
+
+Map, Object> data = map.get(key);
+if(data == null) {
+return null;
+}
+
+
[GitHub] cayenne pull request #350: Some changes in cgen tab
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/350 ---
[3/3] cayenne git commit: Merge PR #350
Merge PR #350 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/aa8f88ce Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/aa8f88ce Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/aa8f88ce Branch: refs/heads/master Commit: aa8f88ce30d3d08ccc332298739c4208e3f95e60 Parents: 781dcce 838b21a Author: Nikita Timofeev Authored: Thu Nov 22 16:53:51 2018 +0300 Committer: Nikita Timofeev Committed: Thu Nov 22 16:53:51 2018 +0300 -- .../editor/cgen/ClassesTabController.java | 16 +++--- .../modeler/editor/cgen/ClassesTabPanel.java| 31 +--- .../editor/cgen/CodeGeneratorController.java| 45 ++--- .../cgen/CodeGeneratorControllerBase.java | 15 -- .../modeler/editor/cgen/CodeGeneratorPane.java | 53 ++-- .../modeler/editor/cgen/CustomModePanel.java| 4 +- .../editor/cgen/GeneratorControllerPanel.java | 2 +- .../editor/cgen/GeneratorTabController.java | 2 +- .../modeler/editor/cgen/GeneratorTabPanel.java | 35 + .../modeler/editor/cgen/StandardModePanel.java | 2 +- 10 files changed, 80 insertions(+), 125 deletions(-) --
[2/3] cayenne git commit: Update cgen tab in datamap
Update cgen tab in datamap
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/838b21ab
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/838b21ab
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/838b21ab
Branch: refs/heads/master
Commit: 838b21ab41cda1161195a97ef666411f3db3c468
Parents: e6ba48c
Author: Arseni Bulatski
Authored: Thu Nov 22 16:08:11 2018 +0300
Committer: Arseni Bulatski
Committed: Thu Nov 22 16:09:48 2018 +0300
--
.../editor/cgen/ClassesTabController.java | 16 +++---
.../modeler/editor/cgen/ClassesTabPanel.java| 31 +---
.../editor/cgen/CodeGeneratorController.java| 9 ++--
.../cgen/CodeGeneratorControllerBase.java | 15 --
.../modeler/editor/cgen/CodeGeneratorPane.java | 53 ++--
.../modeler/editor/cgen/CustomModePanel.java| 4 +-
.../editor/cgen/GeneratorTabController.java | 2 +-
.../modeler/editor/cgen/GeneratorTabPanel.java | 27 +++---
.../modeler/editor/cgen/StandardModePanel.java | 2 +-
9 files changed, 84 insertions(+), 75 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/838b21ab/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 fe3dc4d..b219aae 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
@@ -43,8 +43,6 @@ public class ClassesTabController extends CayenneController {
this.view = new ClassesTabPanel();
builder = new BindingBuilder(getApplication().getBindingFactory(),
this);
-
-builder.bindToAction(view.getCheckAll(), "checkAllAction()");
}
public void startup(){
@@ -61,6 +59,8 @@ public class ClassesTabController extends CayenneController {
}
protected void initBindings() {
+
builder.bindToAction(((CodeGeneratorPane)parent.getView()).getCheckAll(),
"checkAllAction()");
+
TableBindingBuilder tableBuilder = new TableBindingBuilder(builder);
tableBuilder.addColumn(
@@ -74,14 +74,14 @@ public class ClassesTabController extends CayenneController
{
"parent.getItemName(#item)",
JLabel.class,
false,
-"XXX");
+"XX");
tableBuilder.addColumn(
"Comments, Warnings",
"parent.getProblem(#item)",
String.class,
false,
-"XXX");
+"X");
this.tableBinding = tableBuilder.bindToTable(view.getTable(),
"parent.classes");
view.getTable().getColumnModel().getColumn(1).setCellRenderer(new
ImageRendererColumn());
@@ -109,10 +109,10 @@ public class ClassesTabController extends
CayenneController {
getParentController().enableGenerateButton(true);
}
if (selectedCount < getParentController().getClasses().size()) {
-view.getCheckAll().setSelected(false);
+
((CodeGeneratorPane)parent.getView()).getCheckAll().setSelected(false);
}
else if (selectedCount == getParentController().getClasses().size()) {
-view.getCheckAll().setSelected(true);
+
((CodeGeneratorPane)parent.getView()).getCheckAll().setSelected(true);
}
getParentController().updateSelectedEntities();
}
@@ -122,10 +122,10 @@ public class ClassesTabController extends
CayenneController {
* change.
*/
public void checkAllAction() {
-if
(getParentController().updateSelection(view.getCheckAll().isSelected() ? o ->
true : o -> false)) {
+if
(getParentController().updateSelection(((CodeGeneratorPane)parent.getView()).getCheckAll().isSelected()
? o -> true : o -> false)) {
tableBinding.updateView();
getParentController().updateSelectedEntities();
-if(view.getCheckAll().isSelected()) {
+
if(((CodeGeneratorPane)parent.getView()).getCheckAll().isSelected()) {
getParentController().enableGenerateButton(true);
} else {
getParentController().enableGenerateButton(false);
[1/3] cayenne git commit: Update cgen view.
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
Authored: Wed Nov 21 18:40:11 2018 +0300
Committer: Arseni Bulatski
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,
-"XX");
+"XXX");
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("; ");
-
-
[GitHub] cayenne pull request #350: Some changes in cgen tab
GitHub user aarrsseni opened a pull request: https://github.com/apache/cayenne/pull/350 Some changes in cgen tab You can merge this pull request into a Git repository by running: $ git pull https://github.com/aarrsseni/cayenne cgen-update Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cayenne/pull/350.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #350 commit e6ba48c490d8d79ff231c7a8c9fc6d392e8098fe Author: Arseni Bulatski Date: 2018-11-21T15:40:11Z Update cgen view. commit 838b21ab41cda1161195a97ef666411f3db3c468 Author: Arseni Bulatski Date: 2018-11-22T13:08:11Z Update cgen tab in datamap ---
[jira] [Commented] (CAY-2497) SQL Scripts tab isn't scrollable
[ https://issues.apache.org/jira/browse/CAY-2497?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16695698#comment-16695698 ] ASF GitHub Bot commented on CAY-2497: - Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/348 > SQL Scripts tab isn't scrollable > > > Key: CAY-2497 > URL: https://issues.apache.org/jira/browse/CAY-2497 > Project: Cayenne > Issue Type: Bug > Components: Modeler >Reporter: Arseni Bulatski >Priority: Major > Labels: pull-request-available > Fix For: 4.1.M3 > > > Make SQL Scripts tab scrollable. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[GitHub] cayenne pull request #348: CAY-2497 Modeler: SQL Scripts tab isn't scrollabl...
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/348 ---
[1/3] cayenne git commit: CAY-2497 Modeler: SQL Scripts tab isn't scrollable
Repository: cayenne
Updated Branches:
refs/heads/master 9ac7a2292 -> 781dcce21
CAY-2497 Modeler: SQL Scripts tab isn't scrollable
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c339c308
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c339c308
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c339c308
Branch: refs/heads/master
Commit: c339c308f327243a9294f00ee054ab0b8df2a10d
Parents: b580bda
Author: Arseni Bulatski
Authored: Mon Nov 19 12:15:51 2018 +0300
Committer: Arseni Bulatski
Committed: Mon Nov 19 12:19:51 2018 +0300
--
RELEASE-NOTES.txt | 1 +
.../modeler/editor/SQLTemplateScriptsTab.java | 51 +---
.../components/textpane/JCayenneTextPane.java | 29 ++-
3 files changed, 37 insertions(+), 44 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c339c308/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index d701e29..6943bd2 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -26,6 +26,7 @@ CAY-2487 Removed usage of CayenneException.
CAY-2489 Add validation to the case of not to PK relationships
CAY-2491 Remaster Db Import View
CAY-2493 Save cgen configuration with datamap XML
+CAY-2497 Modeler: SQL Scripts tab isn't scrollable
Bug Fixes:
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c339c308/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java
--
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java
index 90f8451..1427c28 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java
@@ -23,10 +23,10 @@ import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
import org.apache.cayenne.configuration.event.QueryEvent;
-import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.modeler.util.DbAdapterInfo;
import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.map.SQLTemplateDescriptor;
+import org.apache.cayenne.modeler.ProjectController;
+import org.apache.cayenne.modeler.util.DbAdapterInfo;
import org.apache.cayenne.modeler.util.JUndoableCayenneTextPane;
import org.apache.cayenne.swing.components.textpane.JCayenneTextPane;
import org.apache.cayenne.swing.components.textpane.syntax.SQLSyntaxConstants;
@@ -49,11 +49,9 @@ import javax.swing.text.Document;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
+import java.util.*;
import java.util.List;
-import java.util.Map;
+
/**
* A panel for configuring SQL scripts of a SQL template.
@@ -80,6 +78,16 @@ public class SQLTemplateScriptsTab extends JPanel {
initView();
}
+private void prepareScriptAreas() {
+for(String key : DbAdapterInfo.getStandardAdapters()) {
+JCayenneTextPane currPane = new JUndoableCayenneTextPane(new
SQLSyntaxConstants());
+currPane.setName(key);
+currPane.getDocument().addDocumentListener(new
CustomListener(currPane.getName()));
+builder.add(currPane.getScrollPane(), cc.xy(3, 2));
+panes.add(currPane);
+}
+}
+
protected void initView() {
// create widgets, etc.
@@ -114,17 +122,19 @@ public class SQLTemplateScriptsTab extends JPanel {
builder = new PanelBuilder(new FormLayout(
"fill:100dlu, 3dlu, fill:100dlu:grow",
-"3dlu, fill:p:grow"));
+"3dlu, fill:100dlu:grow"));
// orderings table must grow as the panel is resized
builder.add(new JScrollPane(
scripts,
JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
JScrollPane.HORIZONTAL_SCROLLBAR_NEVER), cc.xy(1, 2));
-builder.add(textPane.getPane(), cc.xy(3, 2));
+builder.add(textPane.getScrollPane(), cc.xy(3, 2));
setLayout(new BorderLayout());
add(builder.getPanel(), BorderLayout.CENTER);
+
+prepareScriptAreas();
}
void initFromModel() {
@@ -182,33 +192,16 @@ public class SQLTemplateScriptsTab extends JPanel {
return;
}
-boolean exist = false;
-for
[3/3] cayenne git commit: Cleanup
Cleanup Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/781dcce2 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/781dcce2 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/781dcce2 Branch: refs/heads/master Commit: 781dcce21249b99dcd01323c4a73c60193e2350e Parents: a6c678b Author: Nikita Timofeev Authored: Thu Nov 22 12:12:00 2018 +0300 Committer: Nikita Timofeev Committed: Thu Nov 22 12:12:00 2018 +0300 -- .../apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/781dcce2/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java -- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java index 1427c28..fc4 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java @@ -49,9 +49,11 @@ import javax.swing.text.Document; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.List; - +import java.util.Map; /** * A panel for configuring SQL scripts of a SQL template.
[2/3] cayenne git commit: Merge PR #348
Merge PR #348 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a6c678bf Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a6c678bf Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a6c678bf Branch: refs/heads/master Commit: a6c678bfb48aa5458f884ca385eb7eee842b0f96 Parents: 9ac7a22 c339c30 Author: Nikita Timofeev Authored: Thu Nov 22 12:11:47 2018 +0300 Committer: Nikita Timofeev Committed: Thu Nov 22 12:11:47 2018 +0300 -- RELEASE-NOTES.txt | 1 + .../modeler/editor/SQLTemplateScriptsTab.java | 51 +--- .../components/textpane/JCayenneTextPane.java | 29 ++- 3 files changed, 37 insertions(+), 44 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/a6c678bf/RELEASE-NOTES.txt -- diff --cc RELEASE-NOTES.txt index 4ba4d0c,6943bd2..45a03a4 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@@ -48,7 -48,6 +48,8 @@@ CAY-2476 Modeller: Fixed wrong behaviou CAY-2480 cayenne:cdbgen and cayenne:cgen have identical text in cayenne-maven-plugin CAY-2484 maven plugins missing in 4.1.M2 release CAY-2490 Added dbEntities from other datamaps in dbRelationship dialog. +CAY-2496 Fixed wrong table behavior: focus color, cleanup DBAttribute Path cell on select. ++CAY-2497 Modeler: SQL Scripts tab isn't scrollable -- Release: 4.1.M2
