...
 
Commits (6)
......@@ -12,7 +12,7 @@
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.6.12</version>
<version>3.6.13</version>
<packaging>pom</packaging>
<name>Quadrige3 :: Core</name>
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.6.12</version>
<version>3.6.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -44,7 +44,7 @@
# Please fill the missing licenses for dependencies :
#
#
#Thu Mar 12 14:47:42 CET 2020
#Fri Mar 13 09:32:56 CET 2020
com.oracle--ojdbc7--12.1.0.2.0=OTN license
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1=BSD License
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.6.12</version>
<version>3.6.13</version>
</parent>
<artifactId>quadrige3-core-client</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.6.12</version>
<version>3.6.13</version>
</parent>
<artifactId>quadrige3-core-server</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.6.12</version>
<version>3.6.13</version>
</parent>
<artifactId>quadrige3-core-shared</artifactId>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.6.12</version>
<version>3.6.13</version>
</parent>
<artifactId>quadrige3-mda</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-mda</artifactId>
<version>3.6.12</version>
<version>3.6.13</version>
</parent>
<artifactId>quadrige3-magicdraw-plugin</artifactId>
......
......@@ -14,7 +14,7 @@
# Please fill the missing licenses for dependencies :
#
#
#Thu Mar 12 14:47:02 CET 2020
#Fri Mar 13 09:32:20 CET 2020
com.nomagic--javax_jmi-1_0-fr--17.0.2=
com.nomagic--md--17.0.2=
com.nomagic--md_api--17.0.2=
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-mda</artifactId>
<version>3.6.12</version>
<version>3.6.13</version>
</parent>
<artifactId>quadrige3-mda-client-hsqldb</artifactId>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-mda</artifactId>
<version>3.6.12</version>
<version>3.6.13</version>
</parent>
<artifactId>quadrige3-mda-server-oracle</artifactId>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-mda</artifactId>
<version>3.6.12</version>
<version>3.6.13</version>
</parent>
<artifactId>quadrige3-mda-server-pgsql</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.6.12</version>
<version>3.6.13</version>
</parent>
<artifactId>quadrige3-synchro-server</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.6.12</version>
<version>3.6.13</version>
</parent>
<artifactId>quadrige3-synchro</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.6.12</version>
<version>3.6.13</version>
</parent>
<artifactId>quadrige3-test-shared</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>quadrige3-core</artifactId>
<groupId>fr.ifremer.quadrige3</groupId>
<version>3.6.12</version>
<version>3.6.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.6.12</version>
<version>3.6.13</version>
</parent>
<artifactId>quadrige3-ui-swing-common</artifactId>
......
......@@ -836,6 +836,9 @@ public abstract class AbstractTableUIHandler<R extends AbstractRowUIModel<?, ?>,
protected void onRowModified(int rowIndex, R row, String propertyName, Integer propertyIndex, Object oldValue, Object newValue) {
getModel().setModify(true);
getTable().repaint();
if (getFixedTable() != null) {
getFixedTable().repaint();
}
recomputeRowValidState(row);
}
......@@ -1153,13 +1156,25 @@ public abstract class AbstractTableUIHandler<R extends AbstractRowUIModel<?, ?>,
boolean canContinue = true;
if (source.isEditing()) {
if (getTable().isEditing()) {
// stop editing
boolean stopEdit = source.getCellEditor().stopCellEditing();
// stop editing on main table
boolean stopEdit = getTable().getCellEditor().stopCellEditing();
if (!stopEdit) {
if (LOG.isWarnEnabled()) {
LOG.warn("Could not stop edit cell...");
LOG.warn("Could not stop edit cell on main table...");
}
canContinue = false;
}
}
if (getFixedTable() != null && getFixedTable().isEditing()) {
// stop editing on fixed table
boolean stopEdit = getFixedTable().getCellEditor().stopCellEditing();
if (!stopEdit) {
if (LOG.isWarnEnabled()) {
LOG.warn("Could not stop edit cell on fixed table...");
}
canContinue = false;
}
......@@ -1832,6 +1847,9 @@ public abstract class AbstractTableUIHandler<R extends AbstractRowUIModel<?, ?>,
if (getTable().isEditing()) {
getTable().getCellEditor().stopCellEditing();
}
if (getFixedTable() != null && getFixedTable().isEditing()) {
getFixedTable().getCellEditor().stopCellEditing();
}
}
/**
......
......@@ -46,8 +46,12 @@ public class FixedSwingTable extends SwingTable
private Map<Integer, Integer> modelIndexTransposeMap = new HashMap<>();
public FixedSwingTable(SwingTable table) {
Assert.notNull(table, "A FixedSwingTable must have a main table");
mainTable = table;
// Set component name
setName(mainTable.getName() + "_fixed");
// Affect the main model
setModel(mainTable.getTableModel());
......
......@@ -89,6 +89,7 @@ public abstract class AbstractCellSelectionAction extends AbstractAction {
protected void switchToLeftTable() {
if (onMainTable() && getLeftTable() != null) {
stopActiveEdition();
getMainTable().clearSelection();
setCurrentTable(getLeftTable());
}
......@@ -96,6 +97,7 @@ public abstract class AbstractCellSelectionAction extends AbstractAction {
protected void switchToMainTable() {
if (onLeftTable()) {
stopActiveEdition();
getLeftTable().clearSelection();
setCurrentTable(getMainTable());
}
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.6.12</version>
<version>3.6.13</version>
</parent>
<artifactId>quadrige3-ui-updater</artifactId>
......
......@@ -29,6 +29,12 @@
</properties>
<body>
<release version="3.6.13" date="2020-03-13" description="Stable Release">
<action dev="ludovic.pecquot@e-is.pro" type="fix" issue="51493">
Fix bad FixedSwingTable behavior
</action>
</release>
<release version="3.6.12" date="2020-03-12" description="Stable Release">
<action dev="ludovic.pecquot@e-is.pro" type="fix" issue="51311">
Allows columns in fixed table to be resized and saved in swing session
......
......@@ -5,6 +5,7 @@ Les versions des outils actuellement en production sont <span style="background:
|Quadrige3-Core|Oracle Schema|HSQLDB Schema|ReefDb |DALI |Quadrige²|
|--------------|-------------|-------------|------------|-----|---------|
|3.6.13 |3.2.0 |3.2.0 | |5.1.3| |
|3.6.12 |3.2.0 |3.2.0 | |5.1.2| |
|3.6.11 |3.2.0 |3.2.0 |3.9.6 | | |
|3.6.10 |3.2.0 |3.2.0 |3.9.4,3.9.5 | | |
......
......@@ -5,6 +5,7 @@ Tools versions currently in operation are <span style="background:yellow">**high
|Quadrige3-Core|Oracle Schema|HSQLDB Schema|ReefDb |DALI |Quadrige²|
|--------------|-------------|-------------|------------|-----|---------|
|3.6.13 |3.2.0 |3.2.0 | |5.1.3| |
|3.6.12 |3.2.0 |3.2.0 | |5.1.2| |
|3.6.11 |3.2.0 |3.2.0 |3.9.6 | | |
|3.6.10 |3.2.0 |3.2.0 |3.9.4,3.9.5 | | |
......