Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[6713] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2011-11-25 22:00:11
|
Revision: 6713
http://fudaa.svn.sourceforge.net/fudaa/?rev=6713&view=rev
Author: deniger
Date: 2011-11-25 22:00:04 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/pom.xml
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/CommonBundle.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/Perspective.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/property/PropertyCrueUtils.java
trunk/soft/fudaa-crue/ui-common/src/main/nbm/manifest.mf
trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/Bundle.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-common/
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/Installer.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ActivePerspectiveAbstract.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ResetWindowsAction.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/ModellingScenarioService.java
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/resources/org/fudaa/fudaa/crue/common/action/
trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/action/Bundle.properties
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/ActivePerspectiveAbstract.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/ResetWindowsAction.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java
trunk/soft/fudaa-crue/ui-wrapper/
Modified: trunk/soft/fudaa-crue/ui-common/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml 2011-11-25 22:00:04 UTC (rev 6713)
@@ -7,7 +7,7 @@
<version>0.38-SNAPSHOT</version>
</parent>
- <artifactId>ui-wrapper</artifactId>
+ <artifactId>ui-common</artifactId>
<packaging>nbm</packaging>
<name>Crue UI Common</name>
@@ -24,15 +24,20 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util</artifactId>
- <version>RELEASE70</version>
+ <version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-settings</artifactId>
- <version>RELEASE70</version>
+ <version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-modules</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
<artifactId>org-openide-explorer</artifactId>
<version>${netbeans.version}</version>
</dependency>
@@ -49,7 +54,7 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-awt</artifactId>
- <version>RELEASE70</version>
+ <version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
@@ -59,12 +64,12 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-windows</artifactId>
- <version>RELEASE70</version>
+ <version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
- <version>RELEASE70</version>
+ <version>${netbeans.version}</version>
</dependency>
</dependencies>
@@ -77,6 +82,7 @@
<configuration>
<publicPackages>
<publicPackage>org.*</publicPackage>
+ <publicPackage>org.fudaa.dodico.crue.*</publicPackage>
<publicPackage>com.memoire.*</publicPackage>
</publicPackages>
</configuration>
Deleted: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/ActivePerspectiveAbstract.java
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/ActivePerspectiveAbstract.java 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/ActivePerspectiveAbstract.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -1,61 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.crue.common;
-
-import java.awt.event.ActionEvent;
-
-import org.fudaa.fudaa.crue.common.services.SelectedPerspectiveService;
-import org.openide.util.HelpCtx;
-import org.openide.util.Lookup;
-import org.openide.util.LookupEvent;
-import org.openide.util.LookupListener;
-import org.openide.util.NbBundle;
-import org.openide.util.actions.BooleanStateAction;
-
-public abstract class ActivePerspectiveAbstract extends BooleanStateAction implements LookupListener {
-
- private Lookup.Result result = null;
- SelectedPerspectiveService service = Lookup.getDefault().lookup(SelectedPerspectiveService.class);
- private final String perspectiveId;
-
- public ActivePerspectiveAbstract(String textCode, String perspectiveId) {
- putValue(NAME, NbBundle.getMessage(getClass(), textCode));
- putValue(SHORT_DESCRIPTION, getValue(NAME));
- this.perspectiveId = perspectiveId;
- setBooleanState(false);
- result = service.getLookup().lookupResult(String.class);
- result.allItems();
- result.addLookupListener(this);
-
- }
-
- @Override
- public void resultChanged(LookupEvent lookupEvent) {
- boolean isSelectedPerspective = result.allInstances().contains(getName());
- setBooleanState(isSelectedPerspective);
- if (isSelectedPerspective) {
- setEnabled(false);
- } else {
- setEnabled(true);
- }
- }
-
- @Override
- public String getName() {
- return (String) getValue(NAME);
- }
-
- @Override
- public HelpCtx getHelpCtx() {
- return new HelpCtx(getClass());
- }
-
- @Override
- public void actionPerformed(ActionEvent ev) {
- if (service.activePerspective(perspectiveId)) {
- super.actionPerformed(ev);
- }
- }
-}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/CommonBundle.java
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/CommonBundle.java 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/CommonBundle.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -4,14 +4,30 @@
*/
package org.fudaa.fudaa.crue.common;
+import java.text.MessageFormat;
+import org.openide.util.NbBundle;
+import org.openide.windows.WindowManager;
+
/**
*
* @author genesis
*/
public class CommonBundle {
-
- private CommonBundle(){
-
+
+ public static String getDefaultFrameTitle() {
+ return MessageFormat.format(
+ NbBundle.getBundle("org.netbeans.core.startup.Bundle").getString("currentVersion"),
+ new Object[]{System.getProperty("netbeans.buildnumber")});
}
-
+
+ public static void resetFrameTitle() {
+ WindowManager.getDefault().getMainWindow().setTitle(getDefaultFrameTitle());
+ }
+
+ public static void modifyFrameTitle(String title) {
+ WindowManager.getDefault().getMainWindow().setTitle(title + " | " + getDefaultFrameTitle());
+ }
+
+ private CommonBundle() {
+ }
}
Copied: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/Installer.java (from rev 6712, trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/Installer.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/Installer.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/Installer.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -0,0 +1,51 @@
+package org.fudaa.fudaa.crue.common;
+
+import org.openide.modules.ModuleInfo;
+import org.openide.modules.ModuleInstall;
+import org.openide.util.Lookup;
+import org.openide.util.Lookup.Item;
+import org.openide.util.actions.BooleanStateAction;
+import org.openide.util.lookup.Lookups;
+import org.openide.windows.WindowManager;
+
+public class Installer extends ModuleInstall implements Runnable {
+
+ @Override
+ protected void initialize() {
+ WindowManager.getDefault().invokeWhenUIReady(this);
+ }
+
+ @Override
+ public void validate() throws IllegalStateException {
+ super.validate();
+ }
+
+ @Override
+ public void restored() {
+
+ Lookup.Template<ModuleInfo> template = new Lookup.Template<ModuleInfo>(ModuleInfo.class, "Module[org.fudaa.soft.fudaa.crue.ui.branding", null);
+ Item<ModuleInfo> modules = Lookup.getDefault().lookupItem(template);
+ if (modules != null) {
+ ModuleInfo instance = modules.getInstance();
+ if (instance != null) {
+ System.setProperty("netbeans.buildnumber", instance.getImplementationVersion());
+ }
+ }
+ WindowManager.getDefault().invokeWhenUIReady(this);
+ }
+
+ @Override
+ public void run() {
+ final String folder = "Actions/File/";
+ final String actionId = folder + "org-fudaa-fudaa-crue-study-perspective-ActiveStudy";
+ Lookup.Template<BooleanStateAction> template = new Lookup.Template<BooleanStateAction>(BooleanStateAction.class, actionId, null);
+ Item<BooleanStateAction> lookupAll = Lookups.forPath(folder).lookupItem(template);
+ if (lookupAll == null) {
+ //TODO faire du log avec slf4j.
+ System.err.println(actionId + " must be set to set to the default action to activate");
+ } else {
+ lookupAll.getInstance().actionPerformed(null);
+ }
+
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/Perspective.java
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/Perspective.java 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/Perspective.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -1,24 +1,13 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.common;
/**
*
- * @author genesis
+ * @author deniger ( genesis)
*/
-public class Perspective {
-
- private final String actionName;
+public enum Perspective {
- public Perspective(String actionName) {
- this.actionName = actionName;
- }
-
- public String getActionName() {
- return actionName;
- }
-
-
+ STUDY,
+ MODELLING,
+ POST,
+ TEST;
}
Deleted: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/ResetWindowsAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/ResetWindowsAction.java 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/ResetWindowsAction.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -1,57 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.crue.common;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Set;
-import javax.swing.SwingUtilities;
-import org.fudaa.fudaa.crue.common.services.SelectedPerspectiveService;
-import org.openide.awt.ActionRegistration;
-import org.openide.awt.ActionReference;
-import org.openide.awt.ActionReferences;
-import org.openide.awt.ActionID;
-import org.openide.util.Lookup;
-import org.openide.util.Lookup.Item;
-import org.openide.util.lookup.Lookups;
-import org.openide.windows.TopComponent;
-import org.openide.windows.WindowManager;
-
-@ActionID(category = "Window",
-id = "org.fudaa.fudaa.crue.common.ResetWindowsAction")
-@ActionRegistration(displayName = "#CTL_ResetWindowsAction")
-@ActionReferences({
- @ActionReference(path = "Menu/Window", position = 3333)
-})
-public final class ResetWindowsAction implements ActionListener {
-
- SelectedPerspectiveService service = Lookup.getDefault().lookup(SelectedPerspectiveService.class);
-
- @Override
- public void actionPerformed(ActionEvent e) {
- final String folder = "Actions/Window/";
- final String actionId = folder + "org-netbeans-core-windows-actions-ResetWindowsAction";
- Lookup.Template<ActionListener> template = new Lookup.Template<ActionListener>(ActionListener.class, actionId, null);
- Item<ActionListener> lookupAll = Lookups.forPath(folder).lookupItem(template);
- if (lookupAll == null) {
- //TODO faire du log avec slf4j.
- System.err.println(actionId + " must be set to set to the default action to activate");
- } else {
- Set<TopComponent> opened = WindowManager.getDefault().getRegistry().getOpened();
- for (TopComponent topComponent : opened) {
- topComponent.close();
- }
- lookupAll.getInstance().actionPerformed(null);
- SwingUtilities.invokeLater(new Runnable() {
-
- @Override
- public void run() {
- service.rebuildCurrentPerspective();
- }
- });
-
- }
- }
-}
Copied: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ActivePerspectiveAbstract.java (from rev 6712, trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/ActivePerspectiveAbstract.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ActivePerspectiveAbstract.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ActivePerspectiveAbstract.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -0,0 +1,63 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.common.action;
+
+import java.awt.event.ActionEvent;
+
+import org.fudaa.fudaa.crue.common.Perspective;
+import org.fudaa.fudaa.crue.common.services.SelectedPerspectiveService;
+import org.openide.util.HelpCtx;
+import org.openide.util.Lookup;
+import org.openide.util.LookupEvent;
+import org.openide.util.LookupListener;
+import org.openide.util.NbBundle;
+import org.openide.util.actions.BooleanStateAction;
+
+public abstract class ActivePerspectiveAbstract extends BooleanStateAction implements LookupListener {
+
+ private Lookup.Result result = null;
+ SelectedPerspectiveService service = Lookup.getDefault().lookup(SelectedPerspectiveService.class);
+ private final Perspective perspectiveId;
+
+ public ActivePerspectiveAbstract(String textCode, String perspectiveId, Perspective perspective) {
+ putValue(NAME, NbBundle.getMessage(getClass(), textCode));
+ putValue(SHORT_DESCRIPTION, getValue(NAME));
+ this.perspectiveId = perspective;
+ setBooleanState(false);
+ result = service.getLookup().lookupResult(String.class);
+ result.allItems();
+ result.addLookupListener(this);
+ service.register(perspective, perspectiveId);
+
+ }
+
+ @Override
+ public void resultChanged(LookupEvent lookupEvent) {
+ boolean isSelectedPerspective = result.allInstances().contains(getName());
+ setBooleanState(isSelectedPerspective);
+ if (isSelectedPerspective) {
+ setEnabled(false);
+ } else {
+ setEnabled(true);
+ }
+ }
+
+ @Override
+ public String getName() {
+ return (String) getValue(NAME);
+ }
+
+ @Override
+ public HelpCtx getHelpCtx() {
+ return new HelpCtx(getClass());
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ev) {
+ if (service.activePerspective(perspectiveId)) {
+ super.actionPerformed(ev);
+ }
+ }
+}
Copied: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ResetWindowsAction.java (from rev 6712, trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/ResetWindowsAction.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ResetWindowsAction.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ResetWindowsAction.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -0,0 +1,57 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.common.action;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Set;
+import javax.swing.SwingUtilities;
+import org.fudaa.fudaa.crue.common.services.SelectedPerspectiveService;
+import org.openide.awt.ActionRegistration;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
+import org.openide.awt.ActionID;
+import org.openide.util.Lookup;
+import org.openide.util.Lookup.Item;
+import org.openide.util.lookup.Lookups;
+import org.openide.windows.TopComponent;
+import org.openide.windows.WindowManager;
+
+@ActionID(category = "Window",
+id = "org.fudaa.fudaa.crue.common.ResetWindowsAction")
+@ActionRegistration(displayName = "#CTL_ResetWindowsAction")
+@ActionReferences({
+ @ActionReference(path = "Menu/Window", position = 3333)
+})
+public final class ResetWindowsAction implements ActionListener {
+
+ SelectedPerspectiveService service = Lookup.getDefault().lookup(SelectedPerspectiveService.class);
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ final String folder = "Actions/Window/";
+ final String actionId = folder + "org-netbeans-core-windows-actions-ResetWindowsAction";
+ Lookup.Template<ActionListener> template = new Lookup.Template<ActionListener>(ActionListener.class, actionId, null);
+ Item<ActionListener> lookupAll = Lookups.forPath(folder).lookupItem(template);
+ if (lookupAll == null) {
+ //TODO faire du log avec slf4j.
+ System.err.println(actionId + " must be set to set to the default action to activate");
+ } else {
+ Set<TopComponent> opened = WindowManager.getDefault().getRegistry().getOpened();
+ for (TopComponent topComponent : opened) {
+ topComponent.close();
+ }
+ lookupAll.getInstance().actionPerformed(null);
+ SwingUtilities.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ service.rebuildCurrentPerspective();
+ }
+ });
+
+ }
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/property/PropertyCrueUtils.java
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/property/PropertyCrueUtils.java 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/property/PropertyCrueUtils.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -19,26 +19,32 @@
public static final String TYPE_NAME = "Type";
public static final String COMMENTAIRE_NAME = "Commentaire";
- protected static void setNameAndDisplayName(Node.Property property, String name,String displayName) {
+ protected static void setNameAndDisplayName(Node.Property property, String name, String displayName) {
property.setName(name);
property.setDisplayName(displayName);
}
- protected static void setNameAndDisplayName(Node.Property property, String name,Class bundleClass) {
+
+ protected static void setNameAndDisplayName(Node.Property property, String name) {
+ setNameAndDisplayName(property, name, CommonBundle.class);
+ }
+
+ protected static void setNameAndDisplayName(Node.Property property, String name, Class bundleClass) {
property.setName(name);
property.setDisplayName(NbBundle.getMessage(bundleClass, name));
}
-
+
public static void addProperty(OutlineView view, String property) {
view.addPropertyColumn(property, NbBundle.getMessage(CommonBundle.class, property));
}
- public static void addProperty(OutlineView view, String property,Class bundleClass) {
+ public static void addProperty(OutlineView view, String property, Class bundleClass) {
view.addPropertyColumn(property, NbBundle.getMessage(bundleClass, property));
}
public static void configureNoCustomEditor(FeatureDescriptor typeProp) {
typeProp.setValue("suppressCustomEditor", Boolean.TRUE);
}
+
public static void configureNoEditAsText(FeatureDescriptor typeProp) {
typeProp.setValue("canEditAsText", Boolean.FALSE);
}
Copied: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/ModellingScenarioService.java (from rev 6712, trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/services/PerspectiveService.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/ModellingScenarioService.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/ModellingScenarioService.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -0,0 +1,21 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.common.services;
+
+import org.fudaa.dodico.crue.metier.etude.EMHProjet;
+import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
+
+/**
+ *
+ * @author genesis
+ */
+public interface ModellingScenarioService {
+
+
+ boolean isScenarioLoaded();
+
+ boolean loadScenario(EMHProjet projet,ManagerEMHScenario scenario);
+
+}
Deleted: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -1,86 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.crue.common.services;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.commons.lang.StringUtils;
-import org.openide.util.Lookup;
-import org.openide.util.Lookup.Item;
-import org.openide.util.lookup.AbstractLookup;
-import org.openide.util.lookup.InstanceContent;
-import org.openide.util.lookup.ServiceProvider;
-import org.openide.windows.TopComponent;
-import org.openide.windows.WindowManager;
-
-/**
- *
- * @author genesis
- */
-@ServiceProvider(service = SelectedPerspectiveService.class)
-public class SelectedPerspectiveService implements Lookup.Provider {
-
- InstanceContent content = new InstanceContent();
- Lookup dynamicLookup = new AbstractLookup(content);
- PerspectiveService currentPerspective;
-
- @Override
- public Lookup getLookup() {
- return dynamicLookup;
- }
-
- private void activeTopComponents(Collection<String> topComponents) {
- Set<TopComponent> opened = WindowManager.getDefault().getRegistry().getOpened();
- Set<String> alreadyOpen = new HashSet<String>();
- for (TopComponent openTopComponent : opened) {
- String id = WindowManager.getDefault().findTopComponentID(openTopComponent);
- if (openTopComponent.isOpened() && topComponents.contains(id)) {
- alreadyOpen.add(id);
- openTopComponent.requestVisible();
- } else {
- openTopComponent.close();
- }
- }
- for (String id : topComponents) {
- if (!alreadyOpen.contains(id)) {
- TopComponent findTopComponent = WindowManager.getDefault().findTopComponent(id);
- if (findTopComponent != null) {
- findTopComponent.open();
- findTopComponent.requestVisible();
- }
- else{
- System.err.println("AIEE");
- }
- }
- }
- }
-
- public boolean activePerspective(String persective) {
- final String selectedPersective = dynamicLookup.lookup(String.class);
- if (StringUtils.equals(selectedPersective, persective)) {
- return false;
- }
- if (currentPerspective != null && !currentPerspective.deactivate()) {
- return false;
- }
- Lookup.Template<PerspectiveService> template = new Lookup.Template<PerspectiveService>(PerspectiveService.class, persective, null);
- final Lookup.Item<PerspectiveService> selected = Lookup.getDefault().lookupItem(template);
- currentPerspective = selected == null ? null : selected.getInstance();
- rebuildCurrentPerspective();
- if (selectedPersective != null) {
- content.remove(selectedPersective);
- }
- content.add(persective);
- return true;
- }
-
- public void rebuildCurrentPerspective() {
- activeTopComponents(currentPerspective == null
- ? Collections.EMPTY_SET
- : currentPerspective.getTopComponents());
- }
-}
Copied: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java (from rev 6712, trunk/soft/fudaa-crue/ui-wrapper/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 (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -0,0 +1,96 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.common.services;
+
+import org.fudaa.fudaa.crue.common.Perspective;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.fudaa.crue.common.services.PerspectiveService;
+import org.openide.util.Lookup;
+import org.openide.util.lookup.AbstractLookup;
+import org.openide.util.lookup.InstanceContent;
+import org.openide.util.lookup.ServiceProvider;
+import org.openide.windows.TopComponent;
+import org.openide.windows.WindowManager;
+
+/**
+ *
+ * @author genesis
+ */
+@ServiceProvider(service = SelectedPerspectiveService.class)
+public class SelectedPerspectiveService implements Lookup.Provider {
+
+ private InstanceContent content = new InstanceContent();
+ private Lookup dynamicLookup = new AbstractLookup(content);
+ private PerspectiveService currentPerspective;
+ private Map<Perspective, String> perspectiveNames = new HashMap<Perspective, String>();
+
+ @Override
+ public Lookup getLookup() {
+ return dynamicLookup;
+ }
+
+ private void activeTopComponents(Collection<String> topComponents) {
+ Set<TopComponent> opened = WindowManager.getDefault().getRegistry().getOpened();
+ Set<String> alreadyOpen = new HashSet<String>();
+ for (TopComponent openTopComponent : opened) {
+ String id = WindowManager.getDefault().findTopComponentID(openTopComponent);
+ if (openTopComponent.isOpened() && topComponents.contains(id)) {
+ alreadyOpen.add(id);
+ openTopComponent.requestVisible();
+ } else {
+ openTopComponent.close();
+ }
+ }
+ for (String id : topComponents) {
+ if (!alreadyOpen.contains(id)) {
+ TopComponent findTopComponent = WindowManager.getDefault().findTopComponent(id);
+ if (findTopComponent != null) {
+ findTopComponent.open();
+ findTopComponent.requestVisible();
+ }
+ }
+ }
+ }
+
+ public void register(Perspective perspective, String id) {
+ if (perspectiveNames.containsKey(perspective)) {
+ throw new IllegalAccessError("perspective is already set " + perspective);
+ }
+ perspectiveNames.put(perspective, id);
+
+ }
+
+ public boolean activePerspective(Perspective persectiveEnum) {
+ String perspective = perspectiveNames.get(persectiveEnum);
+ final String selectedPersective = dynamicLookup.lookup(String.class);
+ if (StringUtils.equals(selectedPersective, perspective)) {
+ return false;
+ }
+ if (currentPerspective != null && !currentPerspective.deactivate()) {
+ return false;
+ }
+ Lookup.Template<PerspectiveService> template = new Lookup.Template<PerspectiveService>(PerspectiveService.class, perspective, null);
+ final Lookup.Item<PerspectiveService> selected = Lookup.getDefault().lookupItem(template);
+ currentPerspective = selected == null ? null : selected.getInstance();
+ rebuildCurrentPerspective();
+ if (selectedPersective != null) {
+ content.remove(selectedPersective);
+ }
+ content.add(perspective);
+ return true;
+ }
+
+ public void rebuildCurrentPerspective() {
+ activeTopComponents(currentPerspective == null
+ ? Collections.EMPTY_SET
+ : currentPerspective.getTopComponents());
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/nbm/manifest.mf
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/nbm/manifest.mf 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/src/main/nbm/manifest.mf 2011-11-25 22:00:04 UTC (rev 6713)
@@ -1,4 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module-Layer: org/fudaa/fudaa/crue/common/layer.xml
OpenIDE-Module-Requires: org.openide.windows.WindowManager
+OpenIDE-Module-Install: org/fudaa/fudaa/crue/common/Installer.class
Modified: trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/resources/org/fudaa/fudaa/crue/common/Bundle.properties 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/Bundle.properties 2011-11-25 22:00:04 UTC (rev 6713)
@@ -1,4 +1,3 @@
-CTL_ResetWindowsAction=R\u00e9initialiser les fen\u00eatres
CTL_CtuluLogGroupsAction=Messages
CTL_CtuluLogGroupsTopComponent=Messages
HINT_CtuluLogGroupsTopComponent=Affiche tous les messages
@@ -9,8 +8,6 @@
Type=Type
Commentaire=Commentaire
Level=Niveau
-
-
MessageLevelINFO=Informations
MessageLevelWARNING=Avertissement
MessageLevelERROR=Erreur
Copied: trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/action/Bundle.properties (from rev 6712, trunk/soft/fudaa-crue/ui-wrapper/src/main/resources/org/fudaa/fudaa/crue/common/Bundle.properties)
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/action/Bundle.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/action/Bundle.properties 2011-11-25 22:00:04 UTC (rev 6713)
@@ -0,0 +1 @@
+CTL_ResetWindowsAction=R\u00e9initialiser les fen\u00eatres
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
