This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 858499316 Modeler cleanup
858499316 is described below
commit 858499316f5b09d99f71c20656c1c942c5d6dfb5
Author: Andrus Adamchik <[email protected]>
AuthorDate: Sat Apr 25 15:36:50 2026 -0400
Modeler cleanup
---
.../properties/DbAttributePathComboBoxEditor.java | 1 -
.../DbRelationshipPathComboBoxEditor.java | 1 -
.../properties}/PathChooserComboBoxCellEditor.java | 15 ++--
.../org/apache/cayenne/modeler/util/Version.java | 87 ----------------------
.../apache/cayenne/modeler/util/VersionTest.java | 74 ------------------
5 files changed, 8 insertions(+), 170 deletions(-)
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbAttributePathComboBoxEditor.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbAttributePathComboBoxEditor.java
index f220059bb..1570bd46d 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbAttributePathComboBoxEditor.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbAttributePathComboBoxEditor.java
@@ -28,7 +28,6 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.util.EntityTreeAttributeRelationshipFilter;
import org.apache.cayenne.modeler.util.EntityTreeModel;
import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.modeler.util.PathChooserComboBoxCellEditor;
import org.apache.cayenne.util.CayenneMapEntry;
import org.apache.cayenne.util.Util;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbRelationshipPathComboBoxEditor.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbRelationshipPathComboBoxEditor.java
index 3281a89bd..8f3dd2558 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbRelationshipPathComboBoxEditor.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbRelationshipPathComboBoxEditor.java
@@ -26,7 +26,6 @@ import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.util.EntityTreeModel;
import org.apache.cayenne.modeler.util.EntityTreeRelationshipFilter;
import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.modeler.util.PathChooserComboBoxCellEditor;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
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/ui/project/editor/objentity/properties/PathChooserComboBoxCellEditor.java
similarity index 94%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/PathChooserComboBoxCellEditor.java
index 627f0f5d6..dc054777f 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/ui/project/editor/objentity/properties/PathChooserComboBoxCellEditor.java
@@ -17,13 +17,15 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.modeler.ui.project.editor.objentity.properties;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.modeler.swing.CellRenderers;
import org.apache.cayenne.modeler.swing.WidgetFactory;
import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
import org.apache.cayenne.modeler.swing.table.CayenneTableModel;
+import org.apache.cayenne.modeler.util.EntityTreeModel;
+import org.apache.cayenne.modeler.util.ModelerUtil;
import org.apache.cayenne.util.Util;
import javax.swing.AbstractCellEditor;
@@ -53,10 +55,9 @@ import java.util.List;
import java.util.regex.Pattern;
/**
- * This class used as cell editor, when you need to
- * choose path in comboBox and use autocompletion.
+ * Used as cell editor, when you need to choose path in comboBox and use
autocompletion.
*/
-public abstract class PathChooserComboBoxCellEditor<T extends
CayenneTableModel<?>> extends AbstractCellEditor implements TableCellEditor,
ActionListener, PopupMenuListener {
+abstract class PathChooserComboBoxCellEditor<T extends CayenneTableModel<?>>
extends AbstractCellEditor implements TableCellEditor, ActionListener,
PopupMenuListener {
protected JComboBox<String> comboBoxPathChooser;
protected int previousEmbeddedLevel = 0;
@@ -92,7 +93,7 @@ public abstract class PathChooserComboBoxCellEditor<T extends
CayenneTableModel<
});
AutoCompletion.enable(comboBoxPathChooser, true, true);
((JComponent)
comboBoxPathChooser.getEditor().getEditorComponent()).setBorder(null);
-
comboBoxPathChooser.setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
+ comboBoxPathChooser.setBorder(BorderFactory.createEmptyBorder(0, 5, 0,
0));
comboBoxPathChooser.setRenderer(new PathChooserComboBoxCellRenderer());
comboBoxPathChooser.addActionListener(this);
comboBoxPathChooser.addPopupMenuListener(this);
@@ -102,7 +103,7 @@ public abstract class PathChooserComboBoxCellEditor<T
extends CayenneTableModel<
List<String> currentNodeChildren = new
ArrayList<>(getChildren(getCurrentNode(pathString), pathString));
comboBoxPathChooser.setModel(new
DefaultComboBoxModel<>(currentNodeChildren.toArray(new String[0])));
comboBoxPathChooser.setSelectedItem(pathString);
- if(!pathString.isEmpty()) {
+ if (!pathString.isEmpty()) {
comboBoxPathChooser.showPopup();
}
}
@@ -239,7 +240,7 @@ public abstract class PathChooserComboBoxCellEditor<T
extends CayenneTableModel<
private final class PathChooserComboBoxCellRenderer extends
DefaultListCellRenderer {
- private final ImageIcon rightArrow =
ModelerUtil.buildIcon("icon-arrow-closed.png");
+ private final ImageIcon rightArrow =
ModelerUtil.buildIcon("icon-arrow-closed.png");
@Override
public Component getListCellRendererComponent(JList<?> list, Object
value, int index,
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/Version.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/Version.java
deleted file mode 100644
index ebebc9cca..000000000
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/Version.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*****************************************************************
- * 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
- *
- * https://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.util;
-
-import java.util.StringTokenizer;
-
-/**
- * Helper class to deal with version strings.
- *
- */
-public class Version implements Comparable<Object> {
-
- protected String versionString;
- protected int[] versionParts;
-
- public Version(String versionString) throws NumberFormatException {
- if (versionString == null) {
- throw new IllegalArgumentException("Null version.");
- }
-
- if (versionString.trim().length() == 0) {
- throw new IllegalArgumentException("Empty version.");
- }
-
- this.versionString = versionString;
-
- StringTokenizer toks = new StringTokenizer(versionString, ".");
- versionParts = new int[toks.countTokens()];
-
- for (int i = 0; i < versionParts.length; i++) {
- versionParts[i] = Integer.parseInt(toks.nextToken());
- }
- }
-
- public int compareTo(Object o) {
-
- if (o instanceof CharSequence) {
- o = new Version(o.toString());
- }
- else if (!(o instanceof Version)) {
- throw new IllegalArgumentException(
- "Can only compare to Versions and Strings, got: " + o);
- }
-
- int[] otherVersion = ((Version) o).versionParts;
-
- int len = Math.min(otherVersion.length, versionParts.length);
- for (int i = 0; i < len; i++) {
-
- int delta = versionParts[i] - otherVersion[i];
- if (delta != 0) {
- return delta;
- }
- }
-
- if (versionParts.length < otherVersion.length) {
- return -1;
- }
- else if (versionParts.length > otherVersion.length) {
- return 1;
- }
- else {
- return 0;
- }
- }
-
- public String getVersionString() {
- return versionString;
- }
-}
diff --git
a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/VersionTest.java
b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/VersionTest.java
deleted file mode 100644
index 7a5f9351c..000000000
---
a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/VersionTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************
- * 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
- *
- * https://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.util;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-public class VersionTest {
-
- @Test
- public void testValidConstructor() {
- Version v1 = new Version("1");
- assertEquals("1", v1.getVersionString());
-
- Version v1_1 = new Version("1.1");
- assertEquals("1.1", v1_1.getVersionString());
- }
-
- @Test
- public void testInValidConstructor() {
- try {
- new Version(null);
- fail("null version is invalid");
- }
- catch (IllegalArgumentException nfex) {
-
- }
-
- try {
- new Version(" ");
- fail("empty version is invalid");
- }
- catch (IllegalArgumentException nfex) {
-
- }
-
- try {
- new Version("1a");
- fail("non-numeric version is invalid");
- }
- catch (NumberFormatException nfex) {
-
- }
- }
-
- @Test
- public void testCompare() {
- assertEquals(0, new Version("1.0").compareTo("1.0"));
- assertEquals(0, new Version("1.0.1").compareTo("1.0.1"));
- assertTrue(new Version("1.0.1").compareTo("1.0.2") < 0);
- assertTrue(new Version("1.0.2").compareTo("1.0.1") > 0);
- assertTrue(new Version("1.0.1.1").compareTo("1.0.1") > 0);
- }
-}
