Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8602] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2014-02-07 08:04:29
|
Revision: 8602
http://sourceforge.net/p/fudaa/svn/8602
Author: deniger
Date: 2014-02-07 08:04:26 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
java 7 utilis?\195?\169 partout
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/pom.xml
trunk/soft/fudaa-crue/crue-config/pom.xml
trunk/soft/fudaa-crue/crue-core/pom.xml
trunk/soft/fudaa-crue/crue-emh/pom.xml
trunk/soft/fudaa-crue/crue-io/pom.xml
trunk/soft/fudaa-crue/crue-otfa/pom.xml
trunk/soft/fudaa-crue/crue-project/pom.xml
trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
trunk/soft/fudaa-crue/crue-test/pom.xml
trunk/soft/fudaa-crue/crue-validation/pom.xml
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/DefaultNodePasteType.java
trunk/soft/fudaa-crue/ui-emh/pom.xml
trunk/soft/fudaa-crue/ui-loader/pom.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java
trunk/soft/fudaa-crue/ui-wrapper/pom.xml
Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml 2014-02-07 08:04:26 UTC (rev 8602)
@@ -25,16 +25,9 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<parallel>classes</parallel>
Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml 2014-02-07 08:04:26 UTC (rev 8602)
@@ -27,14 +27,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<parallel>classes</parallel>
Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml 2014-02-07 08:04:26 UTC (rev 8602)
@@ -62,16 +62,9 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<parallel>classes</parallel>
Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml 2014-02-07 08:04:26 UTC (rev 8602)
@@ -27,14 +27,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<parallel>classes</parallel>
Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml 2014-02-07 08:04:26 UTC (rev 8602)
@@ -23,14 +23,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<parallel>classes</parallel>
Modified: trunk/soft/fudaa-crue/crue-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/pom.xml 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-otfa/pom.xml 2014-02-07 08:04:26 UTC (rev 8602)
@@ -27,14 +27,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<parallel>classes</parallel>
Modified: trunk/soft/fudaa-crue/crue-project/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/pom.xml 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-project/pom.xml 2014-02-07 08:04:26 UTC (rev 8602)
@@ -27,14 +27,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<parallel>classes</parallel>
Modified: trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2014-02-07 08:04:26 UTC (rev 8602)
@@ -12,14 +12,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<parallel>methods</parallel>
Modified: trunk/soft/fudaa-crue/crue-test/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-test/pom.xml 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-test/pom.xml 2014-02-07 08:04:26 UTC (rev 8602)
@@ -29,14 +29,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<parallel>methods</parallel>
Modified: trunk/soft/fudaa-crue/crue-validation/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/pom.xml 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-validation/pom.xml 2014-02-07 08:04:26 UTC (rev 8602)
@@ -27,14 +27,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<parallel>classes</parallel>
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/DefaultNodePasteType.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/DefaultNodePasteType.java 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/DefaultNodePasteType.java 2014-02-07 08:04:26 UTC (rev 8602)
@@ -4,8 +4,10 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Iterator;
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
+import org.fudaa.ctulu.CtuluLibArray;
import org.openide.nodes.Node;
import org.openide.util.datatransfer.PasteType;
@@ -15,7 +17,7 @@
*/
public class DefaultNodePasteType extends PasteType {
- final Node dragged;
+ final Node[] dragged;
final Node target;
public static final String PROP_USE_INDEX_AS_DISPLAY_NAME = "useIndexAsDisplayName";
@@ -32,6 +34,11 @@
}
public DefaultNodePasteType(Node dragged, Node target) {
+ this.dragged = new Node[]{dragged};
+ this.target = target;
+ }
+
+ public DefaultNodePasteType(Node[] dragged, Node target) {
this.dragged = dragged;
this.target = target;
}
@@ -66,7 +73,6 @@
node.setDisplayName(Integer.toString(++ordre));
}
-
}
public static void nodeToStart(final List<Node> toStart, boolean useIndexAsDisplayName) {
@@ -88,21 +94,33 @@
}
}
- protected static void nodeDragged(final Node dragged, final Node target) {
- if (dragged == null || target == null) {
+ protected static void nodeDragged(final Node[] dragged, final Node target) {
+ if (dragged == null || target == null || dragged.length == 0) {
return;
}
- boolean useIndexAsDisplayName = isIndexUsedAsDisplayName(dragged);
- Node parentNode = dragged.getParentNode();
+ boolean useIndexAsDisplayName = isIndexUsedAsDisplayName(target);
+ Node parentNode = target.getParentNode();
List<Node> children = new ArrayList(Arrays.asList(parentNode.getChildren().getNodes()));
+ for (Iterator<Node> it = children.iterator(); it.hasNext();) {
+ Node node = it.next();
+ if (node.getParentNode() != parentNode) {
+ it.remove();
+ }
+ }
parentNode.getChildren().remove(children.toArray(new Node[children.size()]));
int targetIdx = children.indexOf(target);
- children.remove(dragged);
- if (targetIdx >= children.size()) {
- children.add(dragged);
- } else {
- children.add(targetIdx, dragged);
+ if (targetIdx < children.indexOf(dragged[0])) {
+ CtuluLibArray.invert(dragged, 0);
}
+ for (Node node : dragged) {
+ children.remove(node);
+ if (targetIdx >= children.size()) {
+ children.add(node);
+ } else {
+ children.add(targetIdx, node);
+ }
+ }
+
parentNode.getChildren().add(children.toArray(new Node[children.size()]));
if (useIndexAsDisplayName) {
updateIndexedDisplayName(parentNode);
Modified: trunk/soft/fudaa-crue/ui-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/pom.xml 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml 2014-02-07 08:04:26 UTC (rev 8602)
@@ -140,17 +140,7 @@
</plugin>
<plugin>
- <!-- NetBeans 6.9+ requires JDK 6 -->
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<!-- to have the jar plugin pickup the nbm generated manifest -->
Modified: trunk/soft/fudaa-crue/ui-loader/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/pom.xml 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/ui-loader/pom.xml 2014-02-07 08:04:26 UTC (rev 8602)
@@ -93,11 +93,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<useDefaultManifestFile>true</useDefaultManifestFile>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java 2014-02-07 08:04:26 UTC (rev 8602)
@@ -1,8 +1,12 @@
package org.fudaa.fudaa.crue.modelling.list;
+import java.awt.Rectangle;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionAdapter;
+import java.awt.event.MouseMotionListener;
import java.util.List;
+import javax.swing.JComponent;
import org.apache.commons.lang.ArrayUtils;
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
@@ -28,6 +32,7 @@
protected void createComponent(String firstColumnName) {
super.createComponent(firstColumnName);
outlineView.setDefaultActionAllowed(true);
+ outlineView.getOutline().setAutoscrolls(true);
outlineView.setNodePopupFactory(new ListNodePopupFactory(this));
outlineView.getOutline().addMouseListener(new MouseAdapter() {
@Override
@@ -43,7 +48,19 @@
}
}
});
+// outlineView.scrollRectToVisible(null);
+ MouseMotionListener doScrollRectToVisible = new MouseMotionAdapter() {
+ public void mouseDragged(MouseEvent e) {
+ System.err.println("e " + e.getY() + " " + outlineView.getOutline().getAutoscrolls());
+ Rectangle r = new Rectangle(0, e.getY(), 10, 10);
+// outlineView.scrollRectToVisible(r);
+// ((JComponent) e.getSource()).scrollRectToVisible(r);
+ outlineView.getOutline().scrollRectToVisible(r);
+ }
+ };
+ outlineView.getOutline().addMouseMotionListener(doScrollRectToVisible);
+
}
/**
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java 2014-02-07 08:04:26 UTC (rev 8602)
@@ -62,7 +62,7 @@
@Override
public PasteType getDropType(Transferable t, int action, int index) {
if (isEditMode()) {
- final Node dragged = NodeTransfer.node(t, NodeTransfer.DND_COPY_OR_MOVE);
+ final Node[] dragged = NodeTransfer.nodes(t, NodeTransfer.DND_COPY_OR_MOVE);
return new DefaultNodePasteType(dragged, this);
}
return null;
@@ -105,7 +105,6 @@
active.setDisplayName(AbstractListContentNode.getActiveDisplay());
set.put(active);
-
CrueConfigMetier propDefinition = modellingScenarioService.getSelectedProjet().getPropDefinition();
NumberFormat formatter = propDefinition.getFormatter(CrueConfigMetierConstants.PROP_XP, DecimalFormatEpsilonEnum.COMPARISON);
String longeurFormatted = null;
Modified: trunk/soft/fudaa-crue/ui-wrapper/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2014-02-07 08:04:26 UTC (rev 8602)
@@ -95,11 +95,6 @@
</configuration>
</plugin>
- <plugin>
- <!-- NetBeans 6.9+ requires JDK 6 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
