You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/11/11 18:52:39 UTC
[1/6] cayenne git commit: Tooltips and labels improvements
Repository: cayenne
Updated Branches:
refs/heads/master db6aab4ff -> 94dfec08d
Tooltips and labels improvements
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/fa5e8916
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/fa5e8916
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/fa5e8916
Branch: refs/heads/master
Commit: fa5e89163cd77bad64643d2b31ff73268c18cae4
Parents: 2b7a21b
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Nov 10 14:41:20 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Nov 10 14:41:20 2016 +0300
----------------------------------------------------------------------
.../dialog/db/DbLoaderOptionsDialog.java | 25 +++++++++++++-------
.../modeler/editor/dbentity/DbEntityTab.java | 2 +-
2 files changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fa5e8916/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java
index fa5c68f..6911586 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java
@@ -43,9 +43,9 @@ public class DbLoaderOptionsDialog extends CayenneDialog {
public static final int SELECT = 1;
protected JLabel catalogLabel;
- protected JComboBox catalogSelector;
+ protected JComboBox<String> catalogSelector;
protected JLabel schemaLabel;
- protected JComboBox schemaSelector;
+ protected JComboBox<String> schemaSelector;
protected JTextField tableNamePatternField;
protected JTextField meaningfulPk;
protected JTextField procNamePatternField;
@@ -54,7 +54,7 @@ public class DbLoaderOptionsDialog extends CayenneDialog {
protected JButton cancelButton;
- protected JComboBox strategyCombo;
+ protected JComboBox<String> strategyCombo;
protected String strategy;
protected int choice;
@@ -81,12 +81,19 @@ public class DbLoaderOptionsDialog extends CayenneDialog {
// create widgets...
selectButton = new JButton("Continue");
cancelButton = new JButton("Cancel");
- catalogSelector = new JComboBox();
- schemaSelector = new JComboBox();
+ catalogSelector = new JComboBox<>();
+ schemaSelector = new JComboBox<>();
tableNamePatternField = new JTextField();
+ tableNamePatternField.setToolTipText("<html>Regular expression to filter table names.<br>" +
+ "Default expression <b>.*</b> includes all tables.</html>");
procNamePatternField = new JTextField();
+ procNamePatternField.setToolTipText("<html>Regular expression to filter stored procedures names.<br>" +
+ "Default expression .* includes all stored procedures.</html>");
meaningfulPk = new JTextField();
- strategyCombo = new JComboBox();
+ meaningfulPk.setToolTipText("<html>Regular expression to filter tables with meaningful primary keys.<br>" +
+ "Multiple expressions divided by comma can be used.<br>" +
+ "Example: <b>^table1,^table2,^prefix.*</b></html>");
+ strategyCombo = new JComboBox<>();
strategyCombo.setEditable(true);
// assemble
@@ -140,7 +147,7 @@ public class DbLoaderOptionsDialog extends CayenneDialog {
Vector<String> arr = NameGeneratorPreferences
.getInstance()
.getLastUsedStrategies();
- strategyCombo.setModel(new DefaultComboBoxModel(arr));
+ strategyCombo.setModel(new DefaultComboBoxModel<>(arr));
boolean showSchemaSelector = schemas != null && !schemas.isEmpty();
schemaSelector.setVisible(showSchemaSelector);
@@ -148,7 +155,7 @@ public class DbLoaderOptionsDialog extends CayenneDialog {
if (showSchemaSelector) {
- schemaSelector.setModel(new DefaultComboBoxModel(schemas.toArray()));
+ schemaSelector.setModel(new DefaultComboBoxModel<>(schemas.toArray(new String[0])));
if (currentSchema != null) {
for (String schema : schemas) {
@@ -165,7 +172,7 @@ public class DbLoaderOptionsDialog extends CayenneDialog {
catalogLabel.setVisible(showCatalogSelector);
if (showCatalogSelector) {
- catalogSelector.setModel(new DefaultComboBoxModel(catalogs.toArray()));
+ catalogSelector.setModel(new DefaultComboBoxModel<>(catalogs.toArray(new String[0])));
if (currentCatalog != null && !currentCatalog.isEmpty()) {
for (String catalog : catalogs) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fa5e8916/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java
index b6f0fb2..595c690 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java
@@ -63,7 +63,7 @@ import com.jgoodies.forms.layout.FormLayout;
*/
public class DbEntityTab extends JPanel implements ExistingSelectionProcessor, DbEntityDisplayListener {
- static final String PK_DEFAULT_GENERATOR = "Default";
+ static final String PK_DEFAULT_GENERATOR = "Cayenne-Generated";
static final String PK_DB_GENERATOR = "Database-Generated";
static final String PK_CUSTOM_SEQUENCE_GENERATOR = "Custom Sequence";
[5/6] cayenne git commit: Small embeddable view fix
Posted by sk...@apache.org.
Small embeddable view fix
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a3ca56f9
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a3ca56f9
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a3ca56f9
Branch: refs/heads/master
Commit: a3ca56f936a51288f6caecdfb623daf5078831be
Parents: df1ff56
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Nov 11 16:32:05 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Nov 11 16:32:05 2016 +0300
----------------------------------------------------------------------
.../main/java/org/apache/cayenne/modeler/editor/EditorView.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a3ca56f9/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
index 09ee599..4b9a82a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
@@ -240,7 +240,7 @@ public class EditorView extends JPanel implements ObjEntityDisplayListener,
detailPanel.add(ejbqlQueryView, EJBQL_QUERY_VIEW);
embeddableView = new EmbeddableTabbedView(eventController);
- detailPanel.add(new JScrollPane(embeddableView), EMBEDDABLE_VIEW);
+ detailPanel.add(embeddableView, EMBEDDABLE_VIEW);
objDetailView = new ObjEntityTabbedView(eventController);
detailPanel.add(objDetailView, OBJ_VIEW);
[6/6] cayenne git commit: Merge branch '126'
Posted by sk...@apache.org.
Merge branch '126'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/94dfec08
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/94dfec08
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/94dfec08
Branch: refs/heads/master
Commit: 94dfec08d5b9d678804c4ede39ac48a18694f52f
Parents: db6aab4 a3ca56f
Author: Savva Kolbachev <s....@gmail.com>
Authored: Fri Nov 11 21:51:43 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Fri Nov 11 21:51:43 2016 +0300
----------------------------------------------------------------------
docs/doc/pom.xml | 6 +-
modeler/cayenne-modeler-generic-ext/pom.xml | 4 +-
.../generic/GenericPlatformInitializer.java | 2 +-
modeler/cayenne-modeler-win-ext/pom.xml | 93 ++++++++++++++++++++
.../modeler/win/WinCayenneModelerModule.java | 30 +++++++
.../org/apache/cayenne/modeler/win/WinMain.java | 50 +++++++++++
.../modeler/win/WinPlatformInitializer.java | 43 +++++++++
modeler/cayenne-modeler-win/pom.xml | 7 +-
modeler/cayenne-modeler/pom.xml | 2 +-
.../dialog/db/DbLoaderOptionsDialog.java | 25 ++++--
.../objentity/ObjAttributeInfoDialogView.java | 4 +-
.../cayenne/modeler/editor/EditorView.java | 2 +-
.../modeler/editor/dbentity/DbEntityTab.java | 2 +-
.../util/PathChooserComboBoxCellEditor.java | 3 +
modeler/pom.xml | 3 +-
pom.xml | 12 +--
16 files changed, 260 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
[3/6] cayenne git commit: Windows Look And Feel
Posted by sk...@apache.org.
Windows Look And Feel
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5bb62a05
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5bb62a05
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5bb62a05
Branch: refs/heads/master
Commit: 5bb62a05a7bb29b3fe042338e83598182b2f71b6
Parents: f3fb4c2
Author: stariy <st...@gmail.com>
Authored: Thu Nov 10 21:53:31 2016 +0300
Committer: stariy <st...@gmail.com>
Committed: Thu Nov 10 21:53:31 2016 +0300
----------------------------------------------------------------------
modeler/cayenne-modeler-win-ext/pom.xml | 93 ++++++++++++++++++++
.../modeler/win/WinCayenneModelerModule.java | 30 +++++++
.../org/apache/cayenne/modeler/win/WinMain.java | 50 +++++++++++
.../modeler/win/WinPlatformInitializer.java | 43 +++++++++
modeler/cayenne-modeler-win/pom.xml | 7 +-
modeler/pom.xml | 3 +-
6 files changed, 224 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bb62a05/modeler/cayenne-modeler-win-ext/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-win-ext/pom.xml b/modeler/cayenne-modeler-win-ext/pom.xml
new file mode 100644
index 0000000..93e837d
--- /dev/null
+++ b/modeler/cayenne-modeler-win-ext/pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>cayenne-modeler-parent</artifactId>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <version>4.0.M4-SNAPSHOT</version>
+ </parent>
+
+ <name>Cayenne Modeler Win Extensions</name>
+ <packaging>jar</packaging>
+ <artifactId>cayenne-modeler-win-ext</artifactId>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-di</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-project</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.jgoodies</groupId>
+ <artifactId>jgoodies-looks</artifactId>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>code-quality</id>
+
+ <activation>
+ <property>
+ <name>!fast-and-dirty</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <!--<configuration>
+ <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation>
+ </configuration>-->
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bb62a05/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinCayenneModelerModule.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinCayenneModelerModule.java b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinCayenneModelerModule.java
new file mode 100644
index 0000000..6c0257e
--- /dev/null
+++ b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinCayenneModelerModule.java
@@ -0,0 +1,30 @@
+/*****************************************************************
+ * 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.win;
+
+import org.apache.cayenne.di.Binder;
+import org.apache.cayenne.di.Module;
+import org.apache.cayenne.modeler.init.platform.PlatformInitializer;
+
+public class WinCayenneModelerModule implements Module {
+
+ public void configure(Binder binder) {
+ binder.bind(PlatformInitializer.class).to(WinPlatformInitializer.class);
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bb62a05/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinMain.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinMain.java b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinMain.java
new file mode 100644
index 0000000..baf66f5
--- /dev/null
+++ b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinMain.java
@@ -0,0 +1,50 @@
+/*****************************************************************
+ * 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.win;
+
+import org.apache.cayenne.di.Module;
+import org.apache.cayenne.modeler.Main;
+
+import java.util.Collection;
+
+public class WinMain extends Main {
+
+ /**
+ * Main method that starts the CayenneModeler.
+ */
+ public static void main(String[] args) {
+ try {
+ new WinMain(args).launch();
+ } catch (Exception e) {
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ protected WinMain(String[] args) {
+ super(args);
+ }
+
+ @Override
+ protected Collection<Module> appendModules(Collection<Module> modules) {
+ modules = super.appendModules(modules);
+ modules.add(new WinCayenneModelerModule());
+ return modules;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bb62a05/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
new file mode 100644
index 0000000..3f7871d
--- /dev/null
+++ b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
@@ -0,0 +1,43 @@
+/*****************************************************************
+ * 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.win;
+
+import com.jgoodies.looks.windows.WindowsLookAndFeel;
+import org.apache.cayenne.modeler.init.platform.PlatformInitializer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.swing.JFrame;
+import javax.swing.UIManager;
+
+public class WinPlatformInitializer implements PlatformInitializer {
+
+ private static Log logger = LogFactory.getLog(WinPlatformInitializer.class);
+
+ public void setupMenus(JFrame frame) {
+ }
+
+ public void initLookAndFeel() {
+ try {
+ UIManager.setLookAndFeel(WindowsLookAndFeel.class.getName());
+ } catch (Exception e) {
+ logger.warn("Error installing L&F: " + WindowsLookAndFeel.class.getName(), e);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bb62a05/modeler/cayenne-modeler-win/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-win/pom.xml b/modeler/cayenne-modeler-win/pom.xml
index c5e355a..99a3e7d 100644
--- a/modeler/cayenne-modeler-win/pom.xml
+++ b/modeler/cayenne-modeler-win/pom.xml
@@ -39,6 +39,11 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler-win-ext</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!--
adding cayenne runtime dependencies explicitly,
as they are marked as "provided" in the modeler pom
@@ -87,7 +92,7 @@
<name>CayenneModeler</name>
<longName>${project.version}</longName>
<destDir>${project.build.outputDirectory}</destDir>
- <mainClass>org.apache.cayenne.modeler.generic.GenericMain</mainClass>
+ <mainClass>org.apache.cayenne.modeler.win.WinMain</mainClass>
<icon>src/japplication/resources/CayenneModeler.ico</icon>
<os>windows</os>
<jvm>1.5+</jvm>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bb62a05/modeler/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/pom.xml b/modeler/pom.xml
index 64a42a5..fbe9a28 100644
--- a/modeler/pom.xml
+++ b/modeler/pom.xml
@@ -40,7 +40,8 @@
<module>cayenne-modeler-mac-ext</module>
<module>cayenne-modeler-mac</module>
<module>cayenne-modeler-win</module>
- </modules>
+ <module>cayenne-modeler-win-ext</module>
+ </modules>
<build>
<plugins>
[2/6] cayenne git commit: Update jgoodies-forms and jgoodies-looks
libraries versions
Posted by sk...@apache.org.
Update jgoodies-forms and jgoodies-looks libraries versions
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f3fb4c2c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f3fb4c2c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f3fb4c2c
Branch: refs/heads/master
Commit: f3fb4c2ccb1ac87ee098f8b59a3138a8095618ec
Parents: fa5e891
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Nov 10 14:43:16 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Nov 10 14:43:16 2016 +0300
----------------------------------------------------------------------
docs/doc/pom.xml | 6 +++---
modeler/cayenne-modeler-generic-ext/pom.xml | 4 ++--
.../modeler/generic/GenericPlatformInitializer.java | 2 +-
modeler/cayenne-modeler/pom.xml | 2 +-
.../dialog/objentity/ObjAttributeInfoDialogView.java | 4 ++--
pom.xml | 12 ++++++------
6 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3fb4c2c/docs/doc/pom.xml
----------------------------------------------------------------------
diff --git a/docs/doc/pom.xml b/docs/doc/pom.xml
index 5f288ca..5639ee0 100644
--- a/docs/doc/pom.xml
+++ b/docs/doc/pom.xml
@@ -73,13 +73,13 @@
</dependency>
<dependency>
- <groupId>jgoodies</groupId>
+ <groupId>com.jgoodies</groupId>
<artifactId>forms</artifactId>
</dependency>
<dependency>
- <groupId>jgoodies</groupId>
- <artifactId>looks</artifactId>
+ <groupId>com.jgoodies</groupId>
+ <artifactId>jgoodies-looks</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3fb4c2c/modeler/cayenne-modeler-generic-ext/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-generic-ext/pom.xml b/modeler/cayenne-modeler-generic-ext/pom.xml
index ecab217..8bbc807 100644
--- a/modeler/cayenne-modeler-generic-ext/pom.xml
+++ b/modeler/cayenne-modeler-generic-ext/pom.xml
@@ -58,8 +58,8 @@
</dependency>
<dependency>
- <groupId>jgoodies</groupId>
- <artifactId>looks</artifactId>
+ <groupId>com.jgoodies</groupId>
+ <artifactId>jgoodies-looks</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3fb4c2c/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java b/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
index 3acd23a..39ee16b 100644
--- a/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
+++ b/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
@@ -48,7 +48,7 @@ public class GenericPlatformInitializer implements PlatformInitializer {
PlasticTheme theme = findTheme();
if (theme != null) {
- PlasticLookAndFeel.setMyCurrentTheme(theme);
+ PlasticLookAndFeel.setCurrentTheme(theme);
}
try {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3fb4c2c/modeler/cayenne-modeler/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/pom.xml b/modeler/cayenne-modeler/pom.xml
index d719b94..e45275c 100644
--- a/modeler/cayenne-modeler/pom.xml
+++ b/modeler/cayenne-modeler/pom.xml
@@ -53,7 +53,7 @@
</dependency>
<dependency>
- <groupId>jgoodies</groupId>
+ <groupId>com.jgoodies</groupId>
<artifactId>forms</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3fb4c2c/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialogView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialogView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialogView.java
index e826f79..1acc7e7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialogView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialogView.java
@@ -179,8 +179,8 @@ public class ObjAttributeInfoDialogView extends JDialog {
public void componentResized(ComponentEvent e) {
int delta = e.getComponent().getHeight() - height;
if (delta < 0) {
- fL.setRowSpec(3, new RowSpec("fill:min(10dlu;pref):grow"));
- fLEmb.setRowSpec(1, new RowSpec("fill:min(10dlu;pref):grow"));
+ fL.setRowSpec(3, RowSpec.decode("fill:min(10dlu;pref):grow"));
+ fLEmb.setRowSpec(1, RowSpec.decode("fill:min(10dlu;pref):grow"));
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3fb4c2c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3632bf2..fff5310 100644
--- a/pom.xml
+++ b/pom.xml
@@ -334,15 +334,15 @@
<version>4.0.38</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>jgoodies</groupId>
+ <dependency>
+ <groupId>com.jgoodies</groupId>
<artifactId>forms</artifactId>
- <version>1.0.5</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
- <groupId>jgoodies</groupId>
- <artifactId>looks</artifactId>
- <version>1.3.1</version>
+ <groupId>com.jgoodies</groupId>
+ <artifactId>jgoodies-looks</artifactId>
+ <version>2.7.0</version>
</dependency>
<dependency>
<groupId>jgroups</groupId>
[4/6] cayenne git commit: Fixed select db path in object attribute
edit
Posted by sk...@apache.org.
Fixed select db path in object attribute edit
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/df1ff56d
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/df1ff56d
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/df1ff56d
Branch: refs/heads/master
Commit: df1ff56d8fabd0f19bc3af052e11b81d3011c8f4
Parents: 5bb62a0
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Nov 11 14:31:14 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Nov 11 14:31:14 2016 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java | 2 +-
.../cayenne/modeler/util/PathChooserComboBoxCellEditor.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/df1ff56d/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java
index 595c690..097ec8b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java
@@ -63,7 +63,7 @@ import com.jgoodies.forms.layout.FormLayout;
*/
public class DbEntityTab extends JPanel implements ExistingSelectionProcessor, DbEntityDisplayListener {
- static final String PK_DEFAULT_GENERATOR = "Cayenne-Generated";
+ static final String PK_DEFAULT_GENERATOR = "Cayenne-Generated (Default)";
static final String PK_DB_GENERATOR = "Database-Generated";
static final String PK_CUSTOM_SEQUENCE_GENERATOR = "Custom Sequence";
http://git-wip-us.apache.org/repos/asf/cayenne/blob/df1ff56d/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java
index 2c5509b..fd796f8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java
@@ -59,6 +59,7 @@ public abstract class PathChooserComboBoxCellEditor extends AbstractCellEditor i
protected int previousEmbeddedLevel = 0;
protected EntityTreeModel treeModel;
protected int row;
+ private JTable table;
protected abstract void enterPressed(JTable table);
@@ -72,6 +73,7 @@ public abstract class PathChooserComboBoxCellEditor extends AbstractCellEditor i
Object currentNode = getCurrentNodeToInitializeCombo(model, row);
String dbAttributePath = getPathToInitializeCombo(model, row);
List<String> nodeChildren = getChildren(currentNode, dbAttributePath);
+ this.table = table;
comboBoxPathChooser = Application.getWidgetFactory().createComboBox(
nodeChildren,
false);
@@ -213,6 +215,7 @@ public abstract class PathChooserComboBoxCellEditor extends AbstractCellEditor i
if (comboBoxPathChooser.getSelectedIndex() != (-1)) {
((JTextComponent) (comboBoxPathChooser).
getEditor().getEditorComponent()).setText(comboBoxPathChooser.getSelectedItem().toString());
+ enterPressed(table);
}
}