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 2021/03/19 12:39:32 UTC
[cayenne] 01/02: CAY-2702 Modeler: Callbacks table has too small
default width
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit b80db8760588a67cee0e4b3b96b2d6e6d4e0f2e9
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Fri Mar 19 15:34:32 2021 +0300
CAY-2702 Modeler: Callbacks table has too small default width
(cherry picked from commit e8de8a5b2c79f23175d5af163c22ec6c69ae714d)
---
.../cayenne/modeler/editor/AbstractCallbackMethodsTab.java | 14 +++++++++++---
.../modeler/editor/ObjEntityCallbackMethodsTab.java | 14 +++++---------
.../cayenne/modeler/pref/TableColumnPreferences.java | 5 ++---
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java
index 858a07c..3ecb0cd 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java
@@ -69,7 +69,10 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionListener;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* Base abstract class for all callback methods editing tabs Contains logic for callback
@@ -78,7 +81,12 @@ import java.util.List;
*/
public abstract class AbstractCallbackMethodsTab extends JPanel {
- private static Logger logger = LoggerFactory.getLogger(AbstractCallbackMethodsTab.class);
+ private static final Logger logger = LoggerFactory.getLogger(AbstractCallbackMethodsTab.class);
+
+ /**
+ * Min sizes for the table columns
+ */
+ private static final Map<Integer, Integer> MIN_SIZES = Collections.singletonMap(0, 150);
/**
* mediator instance
@@ -286,7 +294,7 @@ public abstract class AbstractCallbackMethodsTab extends JPanel {
}
for (CayenneTable table : tables) {
- tablePreferences.bind(table, null, null, null);
+ tablePreferences.bind(table, MIN_SIZES, null, null);
}
}
@@ -607,7 +615,7 @@ public abstract class AbstractCallbackMethodsTab extends JPanel {
public void mouseDragged(MouseEvent e) {
if(table.getColumnWidthChanged()) {
- tablePreferences.bind(table, null, null, null);
+ tablePreferences.bind(table, MIN_SIZES, null, null);
for (CayenneTable nextTable : tables) {
if (!table.equals(nextTable)) {
nextTable.getColumnModel().getColumn(0).setPreferredWidth(table.getWidth());
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityCallbackMethodsTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityCallbackMethodsTab.java
index 0eda66a..eaa699b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityCallbackMethodsTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityCallbackMethodsTab.java
@@ -57,15 +57,11 @@ public class ObjEntityCallbackMethodsTab extends AbstractCallbackMethodsTab {
}
);
- mediator.addObjEntityDisplayListener(
- new ObjEntityDisplayListener() {
- public void currentObjEntityChanged(EntityDisplayEvent e) {
- if (ObjEntityCallbackMethodsTab.this.isVisible()) {
- rebuildTables();
- }
- }
- }
- );
+ mediator.addObjEntityDisplayListener(e -> {
+ if (ObjEntityCallbackMethodsTab.this.isVisible()) {
+ rebuildTables();
+ }
+ });
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/TableColumnPreferences.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/TableColumnPreferences.java
index 3c74c3c..33b7df3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/TableColumnPreferences.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/TableColumnPreferences.java
@@ -144,15 +144,14 @@ public class TableColumnPreferences extends CayennePreference {
int defaultWidth;
if (minSizes != null && minSizes.containsKey(modelIndex)) {
column.setMinWidth(minSizes.get(modelIndex));
-
}
if (maxSizes != null && maxSizes.containsKey(modelIndex)) {
column.setMaxWidth(maxSizes.get(modelIndex));
}
- if(defaultSizes!=null && defaultSizes.containsKey(modelIndex)){
- defaultWidth=defaultSizes.get(modelIndex);
+ if(defaultSizes != null && defaultSizes.containsKey(modelIndex)){
+ defaultWidth = defaultSizes.get(modelIndex);
} else {
defaultWidth = column.getPreferredWidth();
}