Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7741] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-10-11 15:23:36
|
Revision: 7741
http://fudaa.svn.sourceforge.net/fudaa/?rev=7741&view=rev
Author: deniger
Date: 2012-10-11 15:23:25 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneurHelper.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/PropertyColumnFilterable.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostAvctTopComponent.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportStdoutTopComponent.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/perspective/PerspectiveServicePost.java
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneurHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneurHelper.java 2012-10-11 08:45:12 UTC (rev 7740)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneurHelper.java 2012-10-11 15:23:25 UTC (rev 7741)
@@ -14,7 +14,7 @@
* @author deniger ( genesis)
*/
public class CatEMHConteneurHelper {
-
+
public static List<CatEMHSection> getSections(EMHSousModele sousModele) {
List<CatEMHSection> res = new ArrayList<CatEMHSection>();
List<CatEMHBranche> branches = getBranches(sousModele);
@@ -33,9 +33,10 @@
}
}
Collections.sort(sectionsWithoutBranches, ObjetNommeByNameComparator.INSTANCE);
+ res.addAll(sectionsWithoutBranches);
return res;
}
-
+
public static List<CatEMHSection> getSections(List<EMHSousModele> sousModeles) {
List<CatEMHSection> res = new ArrayList<CatEMHSection>();
for (EMHSousModele sousModele : sousModeles) {
@@ -43,7 +44,7 @@
}
return res;
}
-
+
public static List<CatEMHNoeud> getNoeuds(EMHSousModele sousModele) {
return EMHHelper.collectEMHInRelationEMHContient(sousModele, EnumCatEMH.NOEUD);
}
@@ -68,11 +69,11 @@
}
return res;
}
-
+
public static List<CatEMHBranche> getBranches(EMHSousModele sousModele) {
return EMHHelper.collectEMHInRelationEMHContient(sousModele, EnumCatEMH.BRANCHE);
}
-
+
public static List<CatEMHBranche> getBranches(List<EMHSousModele> sousModeles) {
List<CatEMHBranche> res = new ArrayList<CatEMHBranche>();
for (EMHSousModele sousModele : sousModeles) {
@@ -80,12 +81,12 @@
}
return res;
}
-
+
public static List<EMHBrancheSaintVenant> getBranchesSaintVenant(EMHSousModele sousModele) {
List<EMH> inRelationEMHContient = EMHHelper.collectEMHInRelationEMHContient(sousModele, EnumCatEMH.BRANCHE);
return EMHHelper.selectClass(inRelationEMHContient, EMHBrancheSaintVenant.class);
}
-
+
public static List<EMHBrancheSaintVenant> getBranchesSaintVenant(List<EMHSousModele> sousModeles) {
List<EMHBrancheSaintVenant> res = new ArrayList<EMHBrancheSaintVenant>();
for (EMHSousModele sousModele : sousModeles) {
@@ -93,12 +94,12 @@
}
return res;
}
-
+
public static List<CatEMHBranche> getBranchesAvecSectionPilote(EMHSousModele sousModele) {
List<EMH> inRelationEMHContient = EMHHelper.collectEMHInRelationEMHContient(sousModele, EnumCatEMH.BRANCHE);
return EMHHelper.selectInClasses(inRelationEMHContient, EMHBrancheBarrageFilEau.class, EMHBrancheBarrageGenerique.class);
}
-
+
public static List<CatEMHBranche> getBranchesAvecSectionPilote(List<EMHSousModele> sousModeles) {
List<CatEMHBranche> res = new ArrayList<CatEMHBranche>();
for (EMHSousModele sousModele : sousModeles) {
@@ -118,7 +119,7 @@
Collections.sort(res, comparator);
return res;
}
-
+
public static List<CatEMHCasier> getCasiers(List<EMHSousModele> sousModeles) {
List<CatEMHCasier> res = new ArrayList<CatEMHCasier>();
for (EMHSousModele sousModele : sousModeles) {
@@ -168,12 +169,12 @@
setForUniqueEMH.add(emh);
list.add(emh);
}
-
+
}
}
return list;
}
-
+
public static List<EMH> getAllSimpleEMH(EMHSousModele sousModele) {
return EMHHelper.collectEMHInRelationEMHContient(sousModele);
}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/PropertyColumnFilterable.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/PropertyColumnFilterable.java 2012-10-11 08:45:12 UTC (rev 7740)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/PropertyColumnFilterable.java 2012-10-11 15:23:25 UTC (rev 7741)
@@ -24,19 +24,21 @@
JMenu menu = new JMenu(NbBundle.getMessage(PropertyColumnFilterable.class, "filter.mainMenuName", displayName));
res.add(menu);
ETable et = (ETable) component;
- CtuluLogsTopComponent logs = (CtuluLogsTopComponent) ((JComponent) component).getClientProperty(
- CtuluLogsTopComponent.class.getSimpleName());
- menu.add(create(new NodeQuickFilterEmptyValue(columnId, displayName), logs));
- menu.add(create(new NodeQuickFilterNotEmptyValue(columnId, displayName), logs));
- Object valueAt = et.getValueAt(row, column);
- if (valueAt instanceof Node.Property) {
- try {
- valueAt = ((Node.Property) valueAt).getValue();
- } catch (Exception ex) {
- Exceptions.printStackTrace(ex);
+ if (et.getRowCount() > 0) {
+ CtuluLogsTopComponent logs = (CtuluLogsTopComponent) ((JComponent) component).getClientProperty(
+ CtuluLogsTopComponent.class.getSimpleName());
+ menu.add(create(new NodeQuickFilterEmptyValue(columnId, displayName), logs));
+ menu.add(create(new NodeQuickFilterNotEmptyValue(columnId, displayName), logs));
+ Object valueAt = et.getValueAt(row, column);
+ if (valueAt instanceof Node.Property) {
+ try {
+ valueAt = ((Node.Property) valueAt).getValue();
+ } catch (Exception ex) {
+ Exceptions.printStackTrace(ex);
+ }
}
+ menu.add(create(new NodeQuickFilterEqualsTo(columnId, displayName, valueAt), logs));
}
- menu.add(create(new NodeQuickFilterEqualsTo(columnId, displayName, valueAt), logs));
}
@Override
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostAvctTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostAvctTopComponent.java 2012-10-11 08:45:12 UTC (rev 7740)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostAvctTopComponent.java 2012-10-11 15:23:25 UTC (rev 7741)
@@ -38,7 +38,7 @@
autostore = false)
@TopComponent.Description(preferredID = PostAvctTopComponent.TOPCOMPONENT_ID,
iconBase = "org/fudaa/fudaa/crue/post/carre-vert_16.png",
- persistenceType = TopComponent.PERSISTENCE_ALWAYS)
+ persistenceType = TopComponent.PERSISTENCE_ALWAYS )
@TopComponent.Registration(mode = "post-bottomRight", openAtStartup = false)
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.post.PostAvctTopComponent")
@ActionReference(path = "Menu/Window/Post",position=5)
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java 2012-10-11 08:45:12 UTC (rev 7740)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java 2012-10-11 15:23:25 UTC (rev 7741)
@@ -25,15 +25,15 @@
* Top component which displays something.
*/
@ConvertAsProperties(dtd = "-//org.fudaa.fudaa.crue.post//PostEmhExplorerTopComponent//EN",
- autostore = false)
+autostore = false)
@TopComponent.Description(preferredID = PostEmhExplorerTopComponent.TOPCOMPONENT_ID,
- iconBase = "org/fudaa/fudaa/crue/post/carre-vert_16.png",
- persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED)
+iconBase = "org/fudaa/fudaa/crue/post/carre-vert_16.png",
+persistenceType = TopComponent.PERSISTENCE_ALWAYS)
@TopComponent.Registration(mode = "post-topLeft", openAtStartup = false)
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.post.PostEmhExplorerTopComponent")
-@ActionReference(path = "Menu/Window/Post",position=4)
+@ActionReference(path = "Menu/Window/Post", position = 4)
@TopComponent.OpenActionRegistration(displayName = "#CTL_PostEmhExplorerTopComponent",
- preferredID = PostEmhExplorerTopComponent.TOPCOMPONENT_ID)
+preferredID = PostEmhExplorerTopComponent.TOPCOMPONENT_ID)
public final class PostEmhExplorerTopComponent extends AbstractTopComponent implements LookupListener {
public static final String TOPCOMPONENT_ID = "PostEmhExplorerTopComponent";
@@ -78,8 +78,8 @@
}
/**
- * 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.
+ * 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() {
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportStdoutTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportStdoutTopComponent.java 2012-10-11 08:45:12 UTC (rev 7740)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportStdoutTopComponent.java 2012-10-11 15:23:25 UTC (rev 7741)
@@ -31,7 +31,7 @@
autostore = false)
@TopComponent.Description(preferredID = PostReportStdoutTopComponent.TOPCOMPONENT_ID,
iconBase = "org/fudaa/fudaa/crue/post/carre-vert_16.png",
- persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED)
+ persistenceType = TopComponent.PERSISTENCE_ALWAYS)
@TopComponent.Registration(mode = "post-topRight", openAtStartup = false)
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.post.PostReportStdoutTopComponent")
@ActionReference(path = "Menu/Window/Post",position=3)
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/perspective/PerspectiveServicePost.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/perspective/PerspectiveServicePost.java 2012-10-11 08:45:12 UTC (rev 7740)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/perspective/PerspectiveServicePost.java 2012-10-11 15:23:25 UTC (rev 7741)
@@ -28,7 +28,6 @@
import org.openide.util.lookup.ServiceProvider;
import org.openide.util.lookup.ServiceProviders;
import org.openide.windows.TopComponent;
-import org.openide.windows.WindowManager;
/**
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
