Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8473] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2013-08-29 06:25:31
|
Revision: 8473
http://sourceforge.net/p/fudaa/svn/8473
Author: deniger
Date: 2013-08-29 06:25:19 +0000 (Thu, 29 Aug 2013)
Log Message:
-----------
CRUE-501
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/common/EMHManagerBuilder.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java
trunk/soft/fudaa-crue/ui-report/pom.xml
trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/SysdocTopComponent.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/EnumNumberFormatter.java
trunk/soft/fudaa-crue/ui-application/nbactions-dev.xml
trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/EnumNumberFormatter.java
Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-08-29 06:25:19 UTC (rev 8473)
@@ -562,8 +562,9 @@
otfa.launchLine=Traitement de la ligne {0}
otfa.launchRefItem=Op\u00e9rations sur le sc\u00e9nario de r\u00e9f\u00e9rence
otfa.launchCibleItem=Op\u00e9rations sur le sc\u00e9nario cible
+otfa.checkComputeCr=Contr\u00f4le des Compte-Rendus du calcul
+otfa.errorLevelFoundInCr=Une erreur a \u00e9t\u00e9 d\u00e9tect\u00e9e dans le compte-rendu du fichier {0}
-
dont_execute.name=Ne pas ex\u00e9cuter
force_excute.name=Forcer l'ex\u00e9cution
execute_if_needed.name=Ex\u00e9cuter que si n\u00e9cessaire
Copied: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/EnumNumberFormatter.java (from rev 8404, trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/EnumNumberFormatter.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/EnumNumberFormatter.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/EnumNumberFormatter.java 2013-08-29 06:25:19 UTC (rev 8473)
@@ -0,0 +1,53 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.metier.transformer;
+
+import gnu.trove.TIntObjectHashMap;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluNumberFormatI;
+import org.fudaa.dodico.crue.config.ccm.ItemEnum;
+import org.fudaa.dodico.crue.config.ccm.ItemVariable;
+import org.fudaa.dodico.crue.config.ccm.PropertyNature;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class EnumNumberFormatter implements CtuluNumberFormatI {
+
+ TIntObjectHashMap<ItemEnum> itemEnumByValue;
+
+ public EnumNumberFormatter(PropertyNature nature) {
+ itemEnumByValue = nature.getItemEnumByValue();
+ }
+
+ public EnumNumberFormatter(ItemVariable variable) {
+ this(variable.getNature());
+ }
+
+ public EnumNumberFormatter(TIntObjectHashMap<ItemEnum> itemEnumByValue) {
+ this.itemEnumByValue = itemEnumByValue;
+ }
+
+ @Override
+ public String format(double _d) {
+ ItemEnum get = itemEnumByValue.get((int) _d);
+ return get == null ? Integer.toString((int) _d) : get.getName();
+ }
+
+ @Override
+ public CtuluNumberFormatI getCopy() {
+ return new EnumNumberFormatter(itemEnumByValue);
+ }
+
+ @Override
+ public String toLocalizedPattern() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public boolean isDecimal() {
+ return false;
+ }
+}
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java 2013-08-29 06:25:19 UTC (rev 8473)
@@ -112,6 +112,9 @@
}
private static String doFormatFromNature(final PropertyNature nature, Object value, CrueConfigMetier ccm, DecimalFormatEpsilonEnum type) {
+ if (nature.isEnum()) {
+ return new EnumNumberFormatter(nature).format((Double) value);
+ }
if (nature.isDuration()) {
if (value instanceof DoubleValuable) {
return nature.getFormatter(type).format(((DoubleValuable) value).toDoubleValue());
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2013-08-29 06:25:19 UTC (rev 8473)
@@ -9,20 +9,26 @@
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogGroup;
+import org.fudaa.ctulu.CtuluLogLevel;
import org.fudaa.ctulu.FileDeleteResult;
import org.fudaa.dodico.crue.common.BusinessMessages;
import org.fudaa.dodico.crue.common.ConnexionInformation;
import org.fudaa.dodico.crue.common.CrueOperationResult;
+import org.fudaa.dodico.crue.common.io.CrueIOResu;
import org.fudaa.dodico.crue.comparaison.ComparaisonSelectorEnum;
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
import org.fudaa.dodico.crue.config.coeur.CoeurConfigContrat;
import org.fudaa.dodico.crue.config.coeur.CoeurManager;
import org.fudaa.dodico.crue.config.coeur.CrueVersionType;
+import org.fudaa.dodico.crue.config.cr.CRReader;
import org.fudaa.dodico.crue.io.Crue10FileFormatFactory;
import org.fudaa.dodico.crue.io.Crue10FileFormatFactory.VersionResult;
import org.fudaa.dodico.crue.io.common.FileLocker;
import org.fudaa.dodico.crue.io.rtfa.RTFAResultLines;
import org.fudaa.dodico.crue.io.rtfa.RTFAResultLinesSaver;
+import org.fudaa.dodico.crue.metier.CrueFileType;
+import org.fudaa.dodico.crue.metier.emh.CompteRendu;
+import org.fudaa.dodico.crue.metier.emh.EMHModeleBase;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
import org.fudaa.dodico.crue.metier.etude.EMHRun;
@@ -305,7 +311,30 @@
EMHScenario emhScenario = null;
if (!load.getLogs().containsFatalError()) {
emhScenario = load.getResult();
+ //on cherche les erreurs dans les CR.
+ List<EMHModeleBase> modeles = emhScenario.getModeles();
+ CtuluLogGroup logCheckCr = logs.createGroup("otfa.checkComputeCr");
+ for (EMHModeleBase modele : modeles) {
+ CtuluLog logForModel = logCheckCr.createNewLog(modele.getNom());
+ for (CrueFileType fileType : CrueFileType.values()) {
+ if (fileType.isResultFileType()) {
+ CompteRendu compteRendu = modele.getCompteRendu(fileType);
+ if (compteRendu != null) {
+ File logFile = compteRendu.getLogFile();
+ if (logFile.isFile()) {
+ CRReader reader = new CRReader(0);//pas d'importance
+ CrueIOResu<CtuluLogLevel> higherLevel = reader.getHigherLevel(logFile);
+ if (higherLevel != null && (CtuluLogLevel.SEVERE.equals(higherLevel.getMetier()) || CtuluLogLevel.FATAL.
+ equals(higherLevel.getMetier()))) {
+ logForModel.addRecord(higherLevel.getMetier(), "otfa.errorLevelFoundInCr", logFile.getName());
+ }
+ }
+ }
+ }
+ }
+ }
}
+
return new CrueOperationResult<EMHScenario>(emhScenario, logs.createCleanGroup());
}
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/pom.xml 2013-08-29 06:25:19 UTC (rev 8473)
@@ -76,7 +76,6 @@
</exclusion>
</exclusions>
</dependency>
-
<!--pour les tests-->
<dependency>
<groupId>junit</groupId>
Added: trunk/soft/fudaa-crue/ui-application/nbactions-dev.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/nbactions-dev.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-application/nbactions-dev.xml 2013-08-29 06:25:19 UTC (rev 8473)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+ <action>
+ <actionName>run</actionName>
+ <goals>
+ <goal>nbm:cluster-app</goal>
+ <goal>nbm:run-platform</goal>
+ </goals>
+ </action>
+ </actions>
Modified: trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/common/EMHManagerBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/common/EMHManagerBuilder.java 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/common/EMHManagerBuilder.java 2013-08-29 06:25:19 UTC (rev 8473)
@@ -26,6 +26,7 @@
import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
import org.fudaa.dodico.crue.config.ccm.DecimalFormatEpsilonEnum;
+import org.fudaa.dodico.crue.config.ccm.ItemVariable;
import org.fudaa.dodico.crue.metier.CrueFileType;
import org.fudaa.dodico.crue.metier.emh.Avancement;
import org.fudaa.dodico.crue.metier.emh.Calc;
@@ -478,6 +479,10 @@
return ((ToStringTransformable) entryValue).toString(this.propertyDefinitionContainer, EnumToString.COMPLETE, DecimalFormatEpsilonEnum.COMPARISON);
}
if (propertyDefinitionContainer.isPropertyDefined(key)) {
+ ItemVariable property = propertyDefinitionContainer.getProperty(key);
+ if (property.getNature() != null && property.getNature().isEnum()) {//TODO a voir car faux...
+ return ObjectUtils.toString(entryValue);
+ }
return TransformerEMHHelper.formatFromPropertyName(key, entryValue, propertyDefinitionContainer,DecimalFormatEpsilonEnum.COMPARISON);
}
if (entryValue.getClass().isEnum()) {
Deleted: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/EnumNumberFormatter.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/EnumNumberFormatter.java 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/EnumNumberFormatter.java 2013-08-29 06:25:19 UTC (rev 8473)
@@ -1,53 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.fudaa.crue.loi.common;
-
-import gnu.trove.TIntObjectHashMap;
-import org.apache.commons.lang.StringUtils;
-import org.fudaa.ctulu.CtuluNumberFormatI;
-import org.fudaa.dodico.crue.config.ccm.ItemEnum;
-import org.fudaa.dodico.crue.config.ccm.ItemVariable;
-import org.fudaa.dodico.crue.config.ccm.PropertyNature;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class EnumNumberFormatter implements CtuluNumberFormatI {
-
- TIntObjectHashMap<ItemEnum> itemEnumByValue;
-
- public EnumNumberFormatter(PropertyNature nature) {
- itemEnumByValue = nature.getItemEnumByValue();
- }
-
- public EnumNumberFormatter(ItemVariable variable) {
- this(variable.getNature());
- }
-
- public EnumNumberFormatter(TIntObjectHashMap<ItemEnum> itemEnumByValue) {
- this.itemEnumByValue = itemEnumByValue;
- }
-
- @Override
- public String format(double _d) {
- ItemEnum get = itemEnumByValue.get((int) _d);
- return get == null ? StringUtils.EMPTY : get.getName();
- }
-
- @Override
- public CtuluNumberFormatI getCopy() {
- return new EnumNumberFormatter(itemEnumByValue);
- }
-
- @Override
- public String toLocalizedPattern() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public boolean isDecimal() {
- return false;
- }
-}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java 2013-08-29 06:25:19 UTC (rev 8473)
@@ -172,6 +172,7 @@
Collections.sort(frtStockage, ObjetNommeByNameComparator.INSTANCE);
DonFrt[] frtStockageArray = (DonFrt[]) frtStockage.toArray(new DonFrt[frtStockage.size()]);
DonFrt[] frtArray = (DonFrt[]) frt.toArray(new DonFrt[frt.size()]);
+ long to = System.currentTimeMillis();
List<LineContent> lines = new ArrayList<LineContent>();
final ObjetNommeCellRenderer objetNommeCellRenderer = new ObjetNommeCellRenderer();
@@ -225,8 +226,13 @@
}
}
gridBuilder.setLines(lines);
+ System.err.println("time create lines= " + (System.currentTimeMillis() - to));
+ to = System.currentTimeMillis();
scrollPane = new JScrollPane(gridBuilder.getPanel());
+ System.err.println("time create panel= " + (System.currentTimeMillis() - to));
+ to = System.currentTimeMillis();
add(scrollPane);
+ System.err.println("time add scrollpane= " + (System.currentTimeMillis() - to));
}
Modified: trunk/soft/fudaa-crue/ui-report/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-report/pom.xml 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/ui-report/pom.xml 2013-08-29 06:25:19 UTC (rev 8473)
@@ -46,6 +46,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
Added: trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml 2013-08-29 06:25:19 UTC (rev 8473)
@@ -0,0 +1,18 @@
+<?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 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.7</netbeans.hint.jdkPlatform>
+ </properties>
+</project-shared-configuration>
Modified: trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/SysdocTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/SysdocTopComponent.java 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/SysdocTopComponent.java 2013-08-29 06:25:19 UTC (rev 8473)
@@ -13,6 +13,8 @@
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.KeyboardFocusManager;
+import java.awt.Label;
+import java.awt.TextField;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
@@ -29,6 +31,7 @@
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.swing.AbstractAction;
import javax.swing.ActionMap;
import javax.swing.DefaultListModel;
@@ -101,7 +104,7 @@
@TopComponent.OpenActionRegistration(displayName = "#CTL_SysdocTopComponent", preferredID = SysdocTopComponent.TOPCOMPONENT_ID)
@ActionReference(path = "Menu/Window/Sysdoc", position = 1)
public final class SysdocTopComponent extends AbstractTopComponent implements ExplorerManager.Provider {
-
+
public static final String TOPCOMPONENT_ID = "SysdocTopComponent";
SysdocService sysdocService = Lookup.getDefault().lookup(SysdocService.class);
private File sysdocLocaleDir;
@@ -116,10 +119,10 @@
private JTextField tf;
private JList listResultat;
protected EditorSearchable editorSearchable;
-
+
public SysdocTopComponent() {
initComponents();
-
+
setName(NbBundle.getMessage(SysdocTopComponent.class, "CTL_SysdocTopComponent"));
setToolTipText(NbBundle.getMessage(SysdocTopComponent.class, "HINT_SysdocTopComponent"));
browser = new HtmlBrowser();
@@ -133,7 +136,7 @@
});
browser.setEnableHome(true);
customizeBrowser();
-
+
txtUrl = getBrowserTextField();
txtUrl.setEditable(false);
treeView = new BeanTreeView();
@@ -181,12 +184,13 @@
}
updateSize();
}
-
+
@Override
protected String getHelpCtxId() {
return null;
}
-
+
+
protected void highlightStateChanged() {
if (btHighlight.isSelected() != this.editorSearchable.isHighlightEnabled()) {
editorSearchable.setHighlightEnabled(btHighlight.isSelected());
@@ -196,7 +200,7 @@
}
}
private boolean fromSearchPanel;
-
+
private JPanel createSearchPanel() {
JPanel pnSearch = new JPanel(new BorderLayout());
tf = new JTextField(10);
@@ -228,7 +232,7 @@
try {
fromSearchPanel = true;
em.setSelectedNodes(new Node[]{resultat.getNode()});
-
+
} catch (PropertyVetoException ex) {
Exceptions.printStackTrace(ex);
}
@@ -240,7 +244,7 @@
pnSearch.add(new JScrollPane(listResultat));
return pnSearch;
}
-
+
protected void search() {
SysdocFolder sysdocFolder = new SysdocFolder(sysdocLocaleDir);
IndexReader reader = null;
@@ -286,12 +290,12 @@
public File getSysdocLocaleDir() {
return sysdocLocaleDir;
}
-
+
public void documentLoaded() {
EventQueue.invokeLater(new Runnable() {
@Override
public void run() {
-
+
if (fromSearchPanel) {
fromSearchPanel = false;
findBar.setText(tf.getText());
@@ -303,7 +307,7 @@
}
});
}
-
+
protected void urlChanged() {
if (sysdocLocaleDir != null && nodeByPath != null && !isUpdating) {
try {
@@ -320,10 +324,10 @@
} catch (Exception exception) {
Logger.getLogger(SysdocTopComponent.class.getName()).log(Level.INFO, "message {0}", exception);
}
-
+
}
}
-
+
protected JTextField getBrowserTextField() {
Component[] components = browser.getComponents();
for (Component component : components) {
@@ -334,7 +338,7 @@
}
return null;
}
-
+
protected JTextField getBrowserTextField(JComponent jc) {
Component[] components = jc.getComponents();
for (Component component : components) {
@@ -345,24 +349,24 @@
if (under != null) {
return under;
}
-
+
}
return null;
}
boolean isUpdating;
-
+
protected void nodeSelectionChanged() {
if (isUpdating) {
return;
}
changeUrlFromNode(null);
}
-
+
@Override
public ExplorerManager getExplorerManager() {
return em;
}
-
+
@Override
protected void componentOpened() {
super.componentOpened();
@@ -397,13 +401,13 @@
if (StringUtils.isNotBlank(position)) {
try {
initPosition = Integer.parseInt(position);
-
+
} catch (NumberFormatException numberFormatException) {
}
updateSize();
}
}
-
+
private void updateSize() {
if (initPosition > 0 && splitPane != null) {
EventQueue.invokeLater(new Runnable() {
@@ -414,16 +418,16 @@
});
}
}
-
+
@Override
public void componentClosedTemporarily() {
browser.getBrowserImpl().stopLoading();
}
-
+
@Override
public void componentClosedDefinitly() {
}
-
+
public void display(String path) {
//test la locale
updateContent();
@@ -433,7 +437,7 @@
containSignet = true;
pathForNode = StringUtils.substringBeforeLast(path, LienDocumentation.SIGNET_SEPARATOR);
}
-
+
Node node = nodeByPath == null ? null : nodeByPath.get(pathForNode);
//selectionne le noeud
if (node == null) {
@@ -455,11 +459,11 @@
Exceptions.printStackTrace(ex);
}
}
-
+
}
private Map<String, Node> nodeByPath;
long timeStampToc;
-
+
private void updateContent() {
File old = sysdocLocaleDir;
sysdocLocaleDir = sysdocService.getSysdocLocalizedDir();
@@ -479,7 +483,7 @@
if (load.getAnalyze().isNotEmpty()) {
LogsDisplayer.displayError(load.getAnalyze(), getDisplayName());
}
-
+
timeStampToc = 0;
if (folder.getTocFile().exists()) {
timeStampToc = folder.getTocFile().lastModified();
@@ -495,7 +499,7 @@
}
}
}
-
+
private void changeUrlFromNode(String signet) {
browser.getBrowserImpl().stopLoading();
Node[] selectedNodes = em.getSelectedNodes();
@@ -523,11 +527,11 @@
}
}
}
-
+
public void reloadToc() {
updateContent();
}
-
+
public void setEmptyPage() {
browser.getBrowserImpl().stopLoading();
try {
@@ -536,11 +540,11 @@
Exceptions.printStackTrace(e);
}
}
-
+
private void customizeBrowser() {
Component[] components = browser.getComponents();
browser.remove(components[1]);
-
+
JButton bt = new JButton(ImageUtilities.loadImageIcon("org/fudaa/fudaa/crue/sysdoc/icons/home.png", false));
bt.setToolTipText(NbBundle.getMessage(SysdocTopComponent.class, "HomeButton.Tooltip"));
configureButton(bt);
@@ -557,7 +561,7 @@
}
}
});
-
+
JButton btPrint = new JButton(ImageUtilities.loadImageIcon("org/fudaa/fudaa/crue/sysdoc/icons/browser.png", false));
btPrint.setToolTipText(NbBundle.getMessage(SysdocTopComponent.class, "PrintButton.Tooltip"));
configureButton(btPrint);
@@ -574,10 +578,10 @@
}
}
});
-
+
final FlowLayout flowLayout = new FlowLayout(FlowLayout.LEFT, 2, 0);
JPanel pnButtons = new JPanel(flowLayout);
-
+
pnButtons.add(btPrint);
pnButtons.add(bt);
JPanel pn = new JPanel(new BuGridLayout(2, 0, 0, true, false));
@@ -585,7 +589,7 @@
pn.add(components[1]);
browser.add(pn, BorderLayout.NORTH);
}
-
+
private void configureButton(JButton button) {
button.setOpaque(false);
button.setBorderPainted(false);
@@ -594,7 +598,7 @@
button.setBorder(BuBorders.EMPTY0000);
}
StyleSheet fontStyleSheet;
-
+
protected final CustomFindBar createFindComponent() {
Component browserComponent = ((JScrollPane) browser.getBrowserComponent()).getViewport().getView();
final JEditorPane editor = (JEditorPane) browserComponent;
@@ -616,12 +620,12 @@
HTMLDocument doc = (HTMLDocument) editor.getDocument();
final Font deriveFont = editor.getFont().deriveFont(editor.getFont().getSize() + 2);
// if (fontStyleSheet == null) {
- fontStyleSheet = new StyleSheet();
- String bodyRule = "body { font-family: " + deriveFont.getFamily() + "; "
- + "font-size: " + (deriveFont.getSize() + 15) + "pt; }";
- fontStyleSheet.addRule(bodyRule);
- doc.getStyleSheet().addStyleSheet(fontStyleSheet);
- doc.getStyleSheet().addRule(bodyRule);
+ fontStyleSheet = new StyleSheet();
+ String bodyRule = "body { font-family: " + deriveFont.getFamily() + "; "
+ + "font-size: " + (deriveFont.getSize() + 15) + "pt; }";
+ fontStyleSheet.addRule(bodyRule);
+ doc.getStyleSheet().addStyleSheet(fontStyleSheet);
+ doc.getStyleSheet().addRule(bodyRule);
// }
editor.setFont(deriveFont);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
