Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8489] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2013-09-06 13:35:59
|
Revision: 8489
http://sourceforge.net/p/fudaa/svn/8489
Author: deniger
Date: 2013-09-06 13:35:50 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
maj bug
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/PerspectiveServiceModelling.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/data/ReportKeyContratCleaner.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/helper/ChooseEMHByTypeHelper.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/perspective/PerspectiveServiceReport.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/Bundle.properties
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/PerspectiveServiceModelling.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/PerspectiveServiceModelling.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/PerspectiveServiceModelling.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -2,7 +2,7 @@
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Set;
import org.fudaa.dodico.crue.edition.EditionChecker;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
@@ -42,11 +42,11 @@
@ServiceProvider(service = PerspectiveService.class)})
public class PerspectiveServiceModelling extends AbstractPerspectiveService {
- private final Set<String> components = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
+ private final Set<String> components = Collections.unmodifiableSet(new LinkedHashSet<String>(Arrays.asList(
+ ModellingPropertiesTopComponent.TOPCOMPONENT_ID,
ModellingContainersTopComponent.TOPCOMPONENT_ID,
ModellingComputeDataTopComponent.TOPCOMPONENT_ID,
ModellingFilesTopComponent.TOPCOMPONENT_ID,
- ModellingPropertiesTopComponent.TOPCOMPONENT_ID,
ModellingNetworkTopComponent.TOPCOMPONENT_ID,
ModellingVisualTopComponent.TOPCOMPONENT_ID,
ModellingCtuluLogTopComponent.TOPCOMPONENT_ID)));
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -45,7 +45,7 @@
@TopComponent.Description(preferredID = ReportLayersTreeComponent.TOPCOMPONENT_ID,
iconBase = "org/fudaa/fudaa/crue/report/rond-orange_16.png",
persistenceType = TopComponent.PERSISTENCE_ALWAYS)
-...@To...gistration(mode = "report-bottomLeft", openAtStartup = false, position = 2)
+...@To...gistration(mode = "report-bottomLeft", openAtStartup = false, position = 1)
@ActionReference(path = "Menu/Window/Report", position = 1)
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.report.ReportLayersTreeComponent")
@TopComponent.OpenActionRegistration(displayName = ReportLayersTreeComponent.TOPCOMPONENT_ACTION_DISPLAYNAME,
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -60,7 +60,7 @@
initComponents();
setName(NbBundle.getMessage(ReportViewManagerTopComponent.class, TOPCOMPONENT_ACTION));
setToolTipText(NbBundle.getMessage(ReportViewManagerTopComponent.class, "HINT_" + TOPCOMPONENT_ID));
- outlineView = new OutlineView();
+ outlineView = new OutlineView(NbBundle.getMessage(ReportViewManagerTopComponent.class, "viewManager.columnName"));
outlineView.getOutline().setColumnHidingAllowed(false);
outlineView.getOutline().setRootVisible(false);
add(outlineView);
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/data/ReportKeyContratCleaner.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/data/ReportKeyContratCleaner.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/data/ReportKeyContratCleaner.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -6,7 +6,6 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
/**
*
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/helper/ChooseEMHByTypeHelper.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/helper/ChooseEMHByTypeHelper.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/helper/ChooseEMHByTypeHelper.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -73,8 +73,7 @@
cb.setSelectedItem(null);
- final List<EMH> allSimpleEMH = reportService.getModele().getAllSimpleEMH();
- Collections.sort(allSimpleEMH, ObjetNommeByNameComparator.INSTANCE);
+ final List<EMH> allSimpleEMH = reportService.getModele().getAllSimpleEMHinUserOrder();
final Set<String> toSelect = new HashSet<String>(emhs);
cb.addItemListener(new ItemListener() {
@Override
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/perspective/PerspectiveServiceReport.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/perspective/PerspectiveServiceReport.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/perspective/PerspectiveServiceReport.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -45,8 +45,8 @@
ReportTimeTopComponent.TOPCOMPONENT_ID,
ReportVariableTopComponent.TOPCOMPONENT_ID,
ReportVisualTopComponent.TOPCOMPONENT_ID,
+ ReportPropertiesTopComponent.TOPCOMPONENT_ID,
ReportLayersTreeComponent.TOPCOMPONENT_ID,
- ReportPropertiesTopComponent.TOPCOMPONENT_ID,
ReportNetworkTopComponent.TOPCOMPONENT_ID,
ReportViewManagerTopComponent.TOPCOMPONENT_ID)));
/**
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -141,7 +141,6 @@
List<String> selectedEMH = new ChooseEMHByTypeHelper().chooseEMH(emhs);
if (selectedEMH != null) {
content.emhs = selectedEMH;
- Collections.sort(content.emhs);
EnumCatEMH usedCat = ChooseEMHByTypeHelper.getUsedCat(reportService, content.emhs);
if (usedCat != oldUsedCat) {
content.variables.clear();
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -164,9 +164,11 @@
}
uiController.setProfilSection(DonPrtHelper.getProfilSection(sectionProfil), reportService.getCcm(), sectionProfil.getParent(), name);
ReportRunVariableKey key = createXtZKey(runCourant.getRunKey());
- AbstractReportGrapheBuilder.applyPersistConfig(content.courbeconfigs.get(key), uiController.getCourbe());
AbstractLoiCourbeModel withKey = (AbstractLoiCourbeModel) uiController.getCourbe().getModel();
withKey.setKey(key);
+ uiController.getCourbe().setSilent(true);
+ AbstractReportGrapheBuilder.applyPersistConfig(content.courbeconfigs.get(key), uiController.getCourbe());
+ uiController.getCourbe().setSilent(false);
courbes.add(uiController.getCourbe());
}
final ItemVariable variableZ = getVariableZ();
Modified: trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/Bundle.properties 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/Bundle.properties 2013-09-06 13:35:50 UTC (rev 8489)
@@ -50,3 +50,4 @@
ValidationVue.DialogMessage=La vue est modifi\u00e9e. Voulez-vous valider les donn\u00e9es ?
formuleCyclesDetected.error=<html><body>La vue n''a pas \u00e9t\u00e9 valid\u00e9e. Des cycles ont \u00e9t\u00e9 d\u00e9tect\u00e9s pour:<ul>{0}</ul></body></html>
button.export.name=Exporter
+viewManager.columnName=Rapports
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
