Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7203] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-05-14 21:38:37
|
Revision: 7203
http://fudaa.svn.sourceforge.net/fudaa/?rev=7203&view=rev
Author: deniger
Date: 2012-05-14 21:38:30 +0000 (Mon, 14 May 2012)
Log Message:
-----------
0.53
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaPropertiesTopComponent.java
trunk/soft/fudaa-crue/ui-otfa/src/main/resources/modes/properties-otfa.wsmode
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostMainTopComponent.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java
trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/properties-study.wsmode
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/editor-study.wsmode
trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/filelist-study.wsmode
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java 2012-05-14 21:38:30 UTC (rev 7203)
@@ -7,6 +7,7 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.EnumMap;
import org.fudaa.fudaa.crue.common.PerspectiveEnum;
@@ -16,6 +17,8 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.apache.commons.lang.ObjectUtils;
import org.openide.util.Lookup;
import org.openide.util.lookup.AbstractLookup;
@@ -149,6 +152,21 @@
: currentPerspective.getDefaultTopComponents());
}
+ public static boolean isSeparate(Mode mode) {
+ if (mode == null) {
+ return false;
+ }
+ Class<? extends Mode> aClass = mode.getClass();
+ try {
+ Method method = aClass.getMethod("getState");
+ Object invoke = method.invoke(mode);
+ return Integer.valueOf(1).equals(invoke);
+ } catch (Exception noSuchMethodException) {
+ Logger.getLogger(SelectedPerspectiveService.class.getName()).log(Level.WARNING, "can't find state", noSuchMethodException);
+ }
+ return false;
+ }
+
private void updateCurrentViews(PerspectiveEnum oldPerspectiveEnum, PerspectiveEnum newPerspectiveEnum) {
//on ferme toutes les perspectives:
Set<TopComponent> opened = WindowManager.getDefault().getRegistry().getOpened();
@@ -165,8 +183,7 @@
}
for (TopComponent topComponent : opened) {
Mode mode = WindowManager.getDefault().findMode(topComponent);
-
- if (dockedModes.contains(mode) && (!mode.getName().startsWith("floating"))) {
+ if (!isSeparate(mode)) {
topComponent.close();
closed.add(topComponent);
}
@@ -178,6 +195,11 @@
}
}
+// WindowManager.getDefault().setRole(newPerspectiveEnum.name());
+// for (TopComponent topComponent : toreopen) {
+// topComponent.open();
+// topComponent.requestActive();
+// }
List<TopComponent> current = closedTopComponents.get(newPerspectiveEnum);
if (current != null) {
for (TopComponent topComponent : current) {
@@ -192,5 +214,6 @@
: currentPerspective.getDefaultTopComponents());
closedTopComponents.put(newPerspectiveEnum, new ArrayList<TopComponent>());
}
+
}
}
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaPropertiesTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaPropertiesTopComponent.java 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaPropertiesTopComponent.java 2012-05-14 21:38:30 UTC (rev 7203)
@@ -25,7 +25,7 @@
@ActionReference(path = "Menu/Window/OTFA", position = 2)
public final class OtfaPropertiesTopComponent extends NbSheetCustom {
- public static final String TOPCOMPONENT_ID = "OTfaPropertiesTopComponent";
+ public static final String TOPCOMPONENT_ID = "OtfaPropertiesTopComponent";
public OtfaPropertiesTopComponent() {
super(true);
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/resources/modes/properties-otfa.wsmode
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/resources/modes/properties-otfa.wsmode 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/resources/modes/properties-otfa.wsmode 2012-05-14 21:38:30 UTC (rev 7203)
@@ -10,5 +10,5 @@
</constraints>
<bounds x="1440" y="604" width="288" height="345" />
<frame state="0"/>
- <empty-behavior permanent="true"/>
+ <empty-behavior permanent="false"/>
</mode>
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostMainTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostMainTopComponent.java 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostMainTopComponent.java 2012-05-14 21:38:30 UTC (rev 7203)
@@ -7,7 +7,6 @@
import javax.swing.JLabel;
import javax.swing.JScrollPane;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
-import org.fudaa.fudaa.crue.common.RoleNames;
import org.fudaa.fudaa.crue.common.services.PostRunService;
import org.fudaa.fudaa.crue.emh.EMHTreePanel;
import org.fudaa.fudaa.crue.study.services.EMHProjetService;
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java 2012-05-14 21:38:30 UTC (rev 7203)
@@ -23,7 +23,7 @@
@TopComponent.Description(preferredID = FileListTopComponent.TOPCOMPONENT_ID,
iconBase = "org/fudaa/fudaa/crue/study/icons/modele_16.png",
persistenceType = TopComponent.PERSISTENCE_ALWAYS)
-@TopComponent.Registration(mode = "explorer", position = 1, openAtStartup = false)
+@TopComponent.Registration(mode = "filelist-study", position = 1, openAtStartup = false)
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.study.FileListTopComponent")
@TopComponent.OpenActionRegistration(displayName = "#CTL_FileListAction",
preferredID = FileListTopComponent.TOPCOMPONENT_ID)
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java 2012-05-14 21:38:30 UTC (rev 7203)
@@ -25,7 +25,7 @@
@TopComponent.Description(preferredID = ScenariosTopComponent.TOPCOMPONENT_ID,
iconBase = "org/fudaa/fudaa/crue/study/icons/scenario_16.png",
persistenceType = TopComponent.PERSISTENCE_ALWAYS)
-@TopComponent.Registration(mode = "editor", openAtStartup = false)
+@TopComponent.Registration(mode = "editor-study", openAtStartup = false)
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.study.ScenariosTopComponent")
@TopComponent.OpenActionRegistration(displayName = "#CTL_ScenariosAction",
preferredID = ScenariosTopComponent.TOPCOMPONENT_ID)
Added: trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/editor-study.wsmode
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/editor-study.wsmode (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/editor-study.wsmode 2012-05-14 21:38:30 UTC (rev 7203)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mode version="2.4">
+ <name unique="editor-study" />
+ <kind type="editor" />
+ <state type="joined" />
+ <bounds x="0" y="0" width="0" height="0" />
+ <frame state="0"/>
+ <active-tc id="ScenariosTopComponent" />
+ <empty-behavior permanent="true"/>
+</mode>
Added: trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/filelist-study.wsmode
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/filelist-study.wsmode (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/filelist-study.wsmode 2012-05-14 21:38:30 UTC (rev 7203)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mode version="2.4">
+ <module name="org.netbeans.core.ui/1" spec="1.2" />
+ <name unique="filelist-study" />
+ <kind type="view" />
+ <state type="joined" />
+ <constraints>
+ <path orientation="horizontal" number="1" weight="0.14712778429073858"/>
+ <path orientation="vertical" number="1" weight="0.5"/>
+ </constraints>
+ <bounds x="192" y="228" width="614" height="520" />
+ <frame state="0"/>
+ <empty-behavior permanent="true"/>
+</mode>
Modified: trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/properties-study.wsmode
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/properties-study.wsmode 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/properties-study.wsmode 2012-05-14 21:38:30 UTC (rev 7203)
@@ -5,10 +5,10 @@
<kind type="view" />
<state type="joined" />
<constraints>
- <path orientation="horizontal" number="20" weight="0.3"/>
- <path orientation="vertical" number="21" weight="0.25"/>
+ <path orientation="horizontal" number="1" weight="0.3"/>
+ <path orientation="vertical" number="2" weight="0.25"/>
</constraints>
<bounds x="1440" y="604" width="288" height="345" />
<frame state="0"/>
- <empty-behavior permanent="true"/>
+ <empty-behavior permanent="false"/>
</mode>
Modified: trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml 2012-05-14 21:38:30 UTC (rev 7203)
@@ -94,6 +94,8 @@
<folder name="Windows2">
<folder name="Modes">
<file name="properties-study.wsmode" url="/modes/properties-study.wsmode"/>
+ <file name="editor-study.wsmode" url="/modes/editor-study.wsmode"/>
+ <file name="filelist-study.wsmode" url="/modes/filelist-study.wsmode"/>
</folder>
</folder>
</filesystem>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
