Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7505] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-07-17 22:21:24
|
Revision: 7505
http://fudaa.svn.sourceforge.net/fudaa/?rev=7505&view=rev
Author: deniger
Date: 2012-07-17 22:21:16 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
Support edition branche et changement de type
Modified Paths:
--------------
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-application/pom.xml
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
trunk/soft/fudaa-crue/ui-modelling/pom.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java
trunk/soft/fudaa-crue/ui-planimetry/nb-configuration.xml
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/loi-dcspEditorWsmode.xml
trunk/soft/fudaa-crue/ui-loi/
trunk/soft/fudaa-crue/ui-loi/pom.xml
trunk/soft/fudaa-crue/ui-loi/src/
trunk/soft/fudaa-crue/ui-loi/src/main/
trunk/soft/fudaa-crue/ui-loi/src/main/java/
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/DcspEditorLoiTopComponent.form
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/DcspEditorLoiTopComponent.java
trunk/soft/fudaa-crue/ui-loi/src/main/nbm/
trunk/soft/fudaa-crue/ui-loi/src/main/nbm/manifest.mf
trunk/soft/fudaa-crue/ui-loi/src/main/nbm/module.xml
trunk/soft/fudaa-crue/ui-loi/src/main/resources/
trunk/soft/fudaa-crue/ui-loi/src/main/resources/org/
trunk/soft/fudaa-crue/ui-loi/src/main/resources/org/fudaa/
trunk/soft/fudaa-crue/ui-loi/src/main/resources/org/fudaa/fudaa/
trunk/soft/fudaa-crue/ui-loi/src/main/resources/org/fudaa/fudaa/crue/
trunk/soft/fudaa-crue/ui-loi/src/main/resources/org/fudaa/fudaa/crue/loi/
trunk/soft/fudaa-crue/ui-loi/src/main/resources/org/fudaa/fudaa/crue/loi/Bundle.properties
trunk/soft/fudaa-crue/ui-loi/src/test/
trunk/soft/fudaa-crue/ui-loi/src/test/java/
trunk/soft/fudaa-crue/ui-loi/src/test/java/org/
trunk/soft/fudaa-crue/ui-loi/src/test/java/org/fudaa/
trunk/soft/fudaa-crue/ui-loi/src/test/java/org/fudaa/fudaa/
trunk/soft/fudaa-crue/ui-loi/src/test/java/org/fudaa/fudaa/crue/
trunk/soft/fudaa-crue/ui-loi/src/test/java/org/fudaa/fudaa/crue/loi/
trunk/soft/fudaa-crue/ui-loi/src/test/java/org/fudaa/fudaa/crue/loi/TestDcspEditorLoiTopComponent.java
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2012-07-17 14:50:58 UTC (rev 7504)
+++ trunk/soft/fudaa-crue/pom.xml 2012-07-17 22:21:16 UTC (rev 7505)
@@ -43,6 +43,7 @@
<module>ui-commandline</module>
<module>ui-wrapper</module>
<module>ui-planimetry</module>
+ <module>ui-loi</module>
</modules>
<dependencyManagement>
<dependencies>
@@ -170,6 +171,12 @@
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>ui-loi</artifactId>
+ <version>${project.version}</version>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>ui-post</artifactId>
<version>${project.version}</version>
<type>nbm</type>
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2012-07-17 14:50:58 UTC (rev 7504)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2012-07-17 22:21:16 UTC (rev 7505)
@@ -38,6 +38,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>ui-loi</artifactId>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>ui-common</artifactId>
<type>nbm</type>
</dependency>
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2012-07-17 14:50:58 UTC (rev 7504)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2012-07-17 22:21:16 UTC (rev 7505)
@@ -87,6 +87,8 @@
<file name="study-topLeft.wsmode" url="study-topLeftWsmode.xml"/>
<file name="study-topRight.wsmode" url="study-topRightWsmode.xml"/>
+ <file name="loi-dcspEditor.wsmode" url="loi-dcspEditorWsmode.xml"/>
+
<file name="modelling-editor.wsmode" url="modelling-editorWsmode.xml"/>
<file name="modelling-bottomLeft.wsmode" url="modelling-bottomLeftWsmode.xml"/>
<file name="modelling-bottomRight.wsmode" url="modelling-bottomRightWsmode.xml"/>
Copied: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/loi-dcspEditorWsmode.xml (from rev 7500, trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-emhBrancheWsmode.xml)
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/loi-dcspEditorWsmode.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/loi-dcspEditorWsmode.xml 2012-07-17 22:21:16 UTC (rev 7505)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mode version="2.4">
+ <name unique="loi-dcspEditor"/>
+ <kind type="view"/>
+ <state type="separated"/>
+ <bounds x="250" y="50" width="400" height="400" />
+ <frame state="0"/>
+ <empty-behavior permanent="false"/>
+</mode>
Property changes on: trunk/soft/fudaa-crue/ui-loi
___________________________________________________________________
Added: svn:ignore
+ target
Added: trunk/soft/fudaa-crue/ui-loi/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/pom.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-loi/pom.xml 2012-07-17 22:21:16 UTC (rev 7505)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>fudaa-crue</artifactId>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <version>0.57-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>ui-loi</artifactId>
+ <packaging>nbm</packaging>
+
+ <name>Crue UI Loi</name>
+ <description>Permet l'édition des lois et profils
+ </description>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-netbeans-api-annotations-common</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-windows</artifactId>
+ <version>RELEASE712</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-util</artifactId>
+ <version>RELEASE712</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-util-lookup</artifactId>
+ <version>RELEASE712</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-awt</artifactId>
+ <version>RELEASE712</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-netbeans-modules-settings</artifactId>
+ <version>RELEASE712</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>nbm-maven-plugin</artifactId>
+ <configuration>
+ <publicPackages>
+ <publicPackage>org.fudaa.fudaa.crue.loi</publicPackage>
+ <publicPackage>org.fudaa.fudaa.crue.loi.*</publicPackage>
+ </publicPackages>
+ </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 -->
+ <useDefaultManifestFile>true</useDefaultManifestFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <url>http://repo1.maven.org/maven2/</url>
+ <id>junit_4</id>
+ <layout>default</layout>
+ <name>Repository for library Library[junit_4]</name>
+ </repository>
+ </repositories>
+</project>
Added: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/DcspEditorLoiTopComponent.form
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/DcspEditorLoiTopComponent.form (rev 0)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/DcspEditorLoiTopComponent.form 2012-07-17 22:21:16 UTC (rev 7505)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.3" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+ <AuxValues>
+ <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
+ <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+ <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+ <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
+ <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
+ <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+ <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+ <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+ <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+ </AuxValues>
+
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+</Form>
Added: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/DcspEditorLoiTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/DcspEditorLoiTopComponent.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/DcspEditorLoiTopComponent.java 2012-07-17 22:21:16 UTC (rev 7505)
@@ -0,0 +1,63 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.loi;
+
+import org.netbeans.api.settings.ConvertAsProperties;
+import org.openide.util.NbBundle;
+import org.openide.windows.TopComponent;
+
+/**
+ * Editeur de lois.
+ */
+@ConvertAsProperties(dtd = "-//org.fudaa.fudaa.crue.loi//DcspEditorLoi//EN",
+autostore = false)
+...@To...scription(preferredID = DcspEditorLoiTopComponent.TOPCOMPONENT_ID,
+persistenceType = TopComponent.PERSISTENCE_ALWAYS)
+...@To...gistration(mode = DcspEditorLoiTopComponent.MODE, openAtStartup = false)
+public final class DcspEditorLoiTopComponent extends TopComponent {
+
+ public static final String MODE = "loi-dcspEditor"; //NOI18N
+ public static final String TOPCOMPONENT_ID = "DcspEditorLoiTopComponent"; //NOI18N
+
+ public DcspEditorLoiTopComponent() {
+ initComponents();
+ setName(NbBundle.getMessage(DcspEditorLoiTopComponent.class, "CTL_" + TOPCOMPONENT_ID));
+ setToolTipText(NbBundle.getMessage(DcspEditorLoiTopComponent.class, "HINT_" + TOPCOMPONENT_ID));
+ }
+
+ /**
+ * This method is called from within the constructor to initialize the form. WARNING: Do NOT modify this code. The
+ * content of this method is always regenerated by the Form Editor.
+ */
+ // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ setLayout(new java.awt.BorderLayout());
+ }// </editor-fold>//GEN-END:initComponents
+
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ // End of variables declaration//GEN-END:variables
+ @Override
+ public void componentOpened() {
+ // TODO add custom code on component opening
+ }
+
+ @Override
+ public void componentClosed() {
+ // TODO add custom code on component closing
+ }
+
+ void writeProperties(java.util.Properties p) {
+ // better to version settings since initial version as advocated at
+ // http://wiki.apidesign.org/wiki/PropertyFiles
+// p.setProperty("version", "1.0");
+ // TODO store your settings
+ }
+
+ void readProperties(java.util.Properties p) {
+// String version = p.getProperty("version");
+ // TODO read your settings according to their version
+ }
+}
Added: trunk/soft/fudaa-crue/ui-loi/src/main/nbm/manifest.mf
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/nbm/manifest.mf (rev 0)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/nbm/manifest.mf 2012-07-17 22:21:16 UTC (rev 7505)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+OpenIDE-Module-Localizing-Bundle: org/fudaa/loi/Bundle.properties
+OpenIDE-Module-Requires: org.openide.windows.WindowManager
Added: trunk/soft/fudaa-crue/ui-loi/src/main/nbm/module.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/nbm/module.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/nbm/module.xml 2012-07-17 22:21:16 UTC (rev 7505)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nbm>
+ <!--
+ <moduleType>autoload</moduleType>
+ <codeNameBase>org.fudaa.loi/1</codeNameBase>
+ <licenseName>Apache License, Version 2.0</licenseName>
+ <licenseFile>license.txt</licenseFile>
+ -->
+</nbm>
Copied: trunk/soft/fudaa-crue/ui-loi/src/main/resources/org/fudaa/fudaa/crue/loi/Bundle.properties (from rev 7480, trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties)
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/resources/org/fudaa/fudaa/crue/loi/Bundle.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/resources/org/fudaa/fudaa/crue/loi/Bundle.properties 2012-07-17 22:21:16 UTC (rev 7505)
@@ -0,0 +1,7 @@
+# Localized module labels. Defaults taken from POM (<name>, <description>, <groupId>) if unset.
+#OpenIDE-Module-Name=
+#OpenIDE-Module-Short-Description=
+#OpenIDE-Module-Long-Description=
+#OpenIDE-Module-Display-Category=
+CTL_DcspEditorLoiTopComponent=Editeur loi
+HINT_DcspEditorLoiTopComponent=Editeur loi
\ No newline at end of file
Added: trunk/soft/fudaa-crue/ui-loi/src/test/java/org/fudaa/fudaa/crue/loi/TestDcspEditorLoiTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/test/java/org/fudaa/fudaa/crue/loi/TestDcspEditorLoiTopComponent.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-loi/src/test/java/org/fudaa/fudaa/crue/loi/TestDcspEditorLoiTopComponent.java 2012-07-17 22:21:16 UTC (rev 7505)
@@ -0,0 +1,30 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.loi;
+
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+
+/**
+ *
+ * @author fred
+ */
+public class TestDcspEditorLoiTopComponent {
+
+ public static void display(JComponent jc) {
+ JFrame fr = new JFrame();
+ fr.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+ fr.setContentPane(jc);
+ fr.setSize(500, 600);
+ fr.setVisible(true);
+ }
+
+ public static void main(String[] args) {
+ DcspEditorLoiTopComponent top = new DcspEditorLoiTopComponent();
+// ModellingEMHNoeudComponentTest.configure(top, "B2", scenario);
+// top.setEditable(true);
+ display(top);
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml 2012-07-17 14:50:58 UTC (rev 7504)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml 2012-07-17 22:21:16 UTC (rev 7505)
@@ -49,6 +49,11 @@
<type>nbm</type>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ui-loi</artifactId>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>ui-common</artifactId>
<type>nbm</type>
@@ -146,7 +151,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java 2012-07-17 14:50:58 UTC (rev 7504)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java 2012-07-17 22:21:16 UTC (rev 7505)
@@ -50,7 +50,6 @@
public static final String MODE = "modelling-emhBranche";
public static final String TOPCOMPONENT_ID = "ModellingEMHBrancheTopComponent";
public static final String TOPCOMPONENT_ACTION = "CTL_" + TOPCOMPONENT_ID;
- public static final String TOPCOMPONENT_ACTION_DISPLAYNAME = "#" + TOPCOMPONENT_ACTION;
JCheckBox cbActive;
JComboBox cbAmont;
JComboBox cbAval;
Modified: trunk/soft/fudaa-crue/ui-planimetry/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/nb-configuration.xml 2012-07-17 14:50:58 UTC (rev 7504)
+++ trunk/soft/fudaa-crue/ui-planimetry/nb-configuration.xml 2012-07-17 22:21:16 UTC (rev 7505)
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
<!--
This file contains additional configuration written by modules in the NetBeans IDE.
The configuration is intended to be shared among all the users of project and
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
- <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+-->
+ <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
<!--
Properties that influence various parts of the IDE, especially code formatting and the like.
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
That way multiple projects can share the same settings (useful for formatting rules for example).
Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
- <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
- </properties>
-</project-shared-configuration>
+-->
+ <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+ </properties>
+</project-shared-configuration>
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java 2012-07-17 14:50:58 UTC (rev 7504)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java 2012-07-17 22:21:16 UTC (rev 7505)
@@ -213,20 +213,21 @@
public FSigLayerGroup getGroupGIS() {
return planimetryCalqueContext.getGroupExternController().getGroupExtern();
}
- boolean gisAlreadyCreation;
EditZonePanel editZonePanel;
public EditZonePanel getEditZonePanel() {
return editZonePanel;
}
+ JComponent gisEditionPalette;
public JComponent createGisEditionPalette() {
- assert gisAlreadyCreation == false;
- gisAlreadyCreation = true;
+ if (gisEditionPalette != null) {
+ return gisEditionPalette;
+ }
PlanimetryGISEditionAction action = new PlanimetryGISEditionAction(getArbreCalqueModel().getTreeSelectionModel(),
gisEditor_, getScene());
action.setUsedAsTab(true);
- final JComponent content = action.buildContentPane();
+ gisEditionPalette = action.buildContentPane();
action.updateBeforeShow();
editZonePanel = new EditZonePanel();
PlanimetryGisPaletteEdition palette = action.getPalette();
@@ -236,11 +237,11 @@
getPlanimetryVisuController().addEditAction(addNoeud);
getPlanimetryVisuController().addEditAction(addCasier);
getPlanimetryVisuController().addEditAction(addBranche);
- content.add(new JSeparator());
- content.add(add(addNoeud.buildToolButton(EbliComponentFactory.INSTANCE)));
- content.add(add(addBranche.buildToolButton(EbliComponentFactory.INSTANCE)));
- content.add(add(addCasier.buildToolButton(EbliComponentFactory.INSTANCE)));
- return content;
+ gisEditionPalette.add(new JSeparator());
+ gisEditionPalette.add(add(addNoeud.buildToolButton(EbliComponentFactory.INSTANCE)));
+ gisEditionPalette.add(add(addBranche.buildToolButton(EbliComponentFactory.INSTANCE)));
+ gisEditionPalette.add(add(addCasier.buildToolButton(EbliComponentFactory.INSTANCE)));
+ return gisEditionPalette;
}
public JComponent getMoveComponent() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
