Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7207] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-05-15 15:50:02
|
Revision: 7207
http://fudaa.svn.sourceforge.net/fudaa/?rev=7207&view=rev
Author: deniger
Date: 2012-05-15 15:49:49 +0000 (Tue, 15 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/ccal/CRLogReader.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/ccal/TestCrueLogReader.java
trunk/soft/fudaa-crue/ui-branding/pom.xml
trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/EntiteProperty.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/FunctionProperty.java
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml
trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/layer.xml
trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/layer.xml
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/BottomLineBorder.java
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/toolbar.xml
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/ccal/CRLogReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/ccal/CRLogReader.java 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/ccal/CRLogReader.java 2012-05-15 15:49:49 UTC (rev 7207)
@@ -32,16 +32,16 @@
* @author deniger ( genesis)
*/
public class CRLogReader {
-
+
public static final int COLUMN_ARGS = 6;
public static final int COLUMN_LINE_NUMBER = 5;
public static final int COLUMN_FILE = 4;
public static final int COLUMN_DATE = 0;
public static final int COLUMN_ID = 1;
public static final int COLUMN_LEVEL = 2;
- public static final int COLUMN_FIRST_ARG = 3;
+ public static final int COLUMN_FONCTION = 3;
private static final Logger LOGGER = Logger.getLogger(CRLogReader.class.getName());
-
+
public static CtuluLogLevel getLevel(String in) {
if (in == null) {
return CtuluLogLevel.ERROR;
@@ -69,7 +69,7 @@
}
return CtuluLogLevel.ERROR;
}
-
+
public CrueIOResu<CtuluLog> read(File f) {
FileReader reader = null;
CrueIOResu<CtuluLog> read = null;
@@ -82,7 +82,7 @@
}
return read;
}
-
+
public CrueIOResu<CtuluLog> read(URL url) {
InputStream input = null;
CrueIOResu<CtuluLog> read = null;
@@ -96,7 +96,7 @@
}
return read;
}
-
+
public CrueIOResu<CtuluLog> read(Reader f) {
CtuluLog readLog = new CtuluLog();
CtuluLog log = new CtuluLog();
@@ -120,6 +120,9 @@
}
LocalDateTime date = DateDurationConverter.getDate(dateValue);
record.setLogDate(date.toDateTime().toDate());
+ if (split.length > COLUMN_FONCTION) {
+ record.setRessourceFunction(split[COLUMN_FONCTION]);
+ }
if (split.length > COLUMN_FILE) {
record.setRessource(split[COLUMN_FILE]);
}
@@ -127,7 +130,6 @@
record.setRessourceLine(split[COLUMN_LINE_NUMBER]);
}
List args = new ArrayList();
- args.add(split[COLUMN_FIRST_ARG]);
if (split.length > COLUMN_ARGS) {
//on reconstruit la chaine pour prendre en compte les quotes:
StringBuilder builder = new StringBuilder();
@@ -160,9 +162,9 @@
log.addWarn("io.log.errorWhileReader", ioe.getMessage());
}
return new CrueIOResu<CtuluLog>(readLog, log);
-
+
}
-
+
private CtuluLogRecord createDefaultRecord(String line) {
final CtuluLogRecord ctuluLogRecord = new CtuluLogRecord(CtuluLogLevel.INFO, line);
ctuluLogRecord.setLevelDetail(SeveriteManager.INFO);
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/ccal/TestCrueLogReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/ccal/TestCrueLogReader.java 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/ccal/TestCrueLogReader.java 2012-05-15 15:49:49 UTC (rev 7207)
@@ -22,10 +22,10 @@
* @author deniger ( genesis)
*/
public class TestCrueLogReader {
-
+
public TestCrueLogReader() {
}
-
+
@Test
public void testRead() {
CRLogReader reader = new CRLogReader();
@@ -34,7 +34,7 @@
CtuluLog metier = read.getMetier();
List<CtuluLogRecord> records = new ArrayList<CtuluLogRecord>(metier.getRecords());
assertEquals(2170, records.size());
-
+
CtuluLogRecord last = records.get(2169);
assertEquals(72, last.getId());
Date logDate = last.getLogDate();
@@ -42,31 +42,31 @@
assertEquals("2012-04-04T09:37:22.000", DateDurationConverter.dateToXsd(dateTime));
assertEquals("DEBUG3", last.getLevelDetail());
assertEquals(CtuluLogLevel.DEBUG, last.getLevel());
- Object[] args = last.getArgs();
- assertEquals(2, args.length);
- assertEquals("ecrireFichier", args[0]);
- assertEquals("./../tests/RUNS/Sc_M10-8_c9c10/R000000//Mo_M10-8_c9c10/M10-8_c9c10.rcal.xml", args[1]);
assertEquals("FichierXML.cpp", last.getRessource());
assertEquals("333", last.getRessourceLine());
-
+ assertEquals("ecrireFichier", last.getRessourceFunction());
+ Object[] args = last.getArgs();
+ assertEquals(1, args.length);
+ assertEquals("./../tests/RUNS/Sc_M10-8_c9c10/R000000//Mo_M10-8_c9c10/M10-8_c9c10.rcal.xml", args[0]);
+
CtuluLogRecord modified = records.get(2167);//cette ligne a été modifiée pour enlever les 2 dernières colonnes
+ assertEquals("ajouterResultatsCalcul", modified.getRessourceFunction());
assertEquals(CtuluLogLevel.INFO, modified.getLevel());
Object[] argsModified = modified.getArgs();
- assertEquals(1, argsModified.length);
- assertEquals("ajouterResultatsCalcul", argsModified[0]);
-
-
- CtuluLogRecord with3Args = records.get(2166);
- Object[] threeArgs = with3Args.getArgs();
- assertEquals(3, threeArgs.length);
- assertEquals("lancerCalculTransitoirePdtFixe", threeArgs[0]);
- assertEquals("Sc_M10-8_c9c10", threeArgs[1]);
- assertEquals("Cc;_T1", threeArgs[2]);//modifie pour tester que le ; n'est pas pris en compte
-
-
-
-
-
-
+ assertEquals(0, argsModified.length);
+
+
+ CtuluLogRecord with2Args = records.get(2166);
+ assertEquals("lancerCalculTransitoirePdtFixe", with2Args.getRessourceFunction());
+ Object[] twoArgs = with2Args.getArgs();
+ assertEquals(2, twoArgs.length);
+ assertEquals("Sc_M10-8_c9c10", twoArgs[0]);
+ assertEquals("Cc;_T1", twoArgs[1]);//modifie pour tester que le ; n'est pas pris en compte
+
+
+
+
+
+
}
}
Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml 2012-05-15 15:49:49 UTC (rev 7207)
@@ -24,6 +24,11 @@
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-loaders</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
<artifactId>org-openide-modules</artifactId>
<version>${netbeans.version}</version>
</dependency>
Added: trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/BottomLineBorder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/BottomLineBorder.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/BottomLineBorder.java 2012-05-15 15:49:49 UTC (rev 7207)
@@ -0,0 +1,36 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.branding;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Insets;
+import javax.swing.border.Border;
+
+/**
+ *
+ * @author deniger
+ */
+public class BottomLineBorder implements Border {
+
+ BottomLineBorder() {
+ }
+
+ @Override
+ public Insets getBorderInsets(Component c) {
+ return new Insets(0, 0, 1, 0);
+ }
+
+ @Override
+ public boolean isBorderOpaque() {
+ return true;
+ }
+
+ @Override
+ public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
+ g.setColor(c.getBackground().darker());
+ g.drawLine(x, y + height - 2, x + width, y + height - 2);
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java 2012-05-15 15:49:49 UTC (rev 7207)
@@ -1,22 +1,93 @@
package org.fudaa.fudaa.crue.branding;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.JToggleButton;
import javax.swing.UIManager;
+import javax.swing.border.Border;
+import javax.swing.border.MatteBorder;
+import org.openide.awt.Toolbar;
+import org.openide.awt.ToolbarPool;
import org.openide.modules.ModuleInfo;
import org.openide.modules.ModuleInstall;
import org.openide.util.Lookup;
import org.openide.util.Lookup.Item;
+import org.openide.windows.WindowManager;
-public class InitGeneralUIInstaller extends ModuleInstall {
-
-
+/**
+ * Gere la configuration des Toolbar et l'initialisation des build numbers.
+ *
+ * @author deniger
+ */
+public class InitGeneralUIInstaller extends ModuleInstall implements Runnable {
+
@Override
public void validate() throws IllegalStateException {
super.validate();
}
-
+
@Override
+ public void run() {
+ Toolbar[] toolbars = ToolbarPool.getDefault().getToolbars();
+ ToolbarPool.getDefault().setConfiguration("toolbar");
+ Toolbar state = getStateToolbar(toolbars);
+ if (state != null) {
+ state.setOpaque(false);
+ state.setBorder(BorderFactory.createCompoundBorder(state.getBorder(), BorderFactory.createEmptyBorder(5, 15, 5, 5)));
+ }
+ Toolbar perspective = getPerspectiveToolbar(toolbars);
+ if (perspective != null) {
+ Component[] components = perspective.getComponents();
+ perspective.removeAll();
+ perspective.setOpaque(false);
+ perspective.setLayout(new BorderLayout());
+ JPanel buttons = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));
+ buttons.setOpaque(false);
+ Border commonBorder = null;
+ for (int i = 0; i < components.length; i++) {
+ final JToggleButton cmp = (JToggleButton) components[i];
+ cmp.setBorderPainted(true);
+ cmp.setOpaque(true);
+ if (commonBorder == null) {
+ final MatteBorder matteBorder = BorderFactory.createMatteBorder(1, 1, 0, 1, cmp.getBackground().darker());
+ commonBorder = BorderFactory.createCompoundBorder(matteBorder, BorderFactory.createEmptyBorder(0, 2, 0, 2));
+ }
+ cmp.setBorder(commonBorder);
+ buttons.setOpaque(false);
+ buttons.add(components[i]);
+
+ }
+ perspective.add(buttons, BorderLayout.SOUTH);
+ perspective.setBorder(BorderFactory.createCompoundBorder(new BottomLineBorder(), BorderFactory.createEmptyBorder(0, 5, 0, 5)));
+ }
+ }
+
+ public static Toolbar getPerspectiveToolbar(Toolbar[] in) {
+ return getPerspective("Perspective", in);
+ }
+
+ public static Toolbar getStateToolbar(Toolbar[] in) {
+ return getPerspective("State", in);
+ }
+
+ public static Toolbar getPerspective(String name, Toolbar[] in) {
+ if (in == null || name == null) {
+ return null;
+ }
+ for (int i = 0; i < in.length; i++) {
+ if (name.equals(in[i].getName())) {
+ return in[i];
+ }
+ }
+ return null;
+ }
+
+ @Override
public void restored() {
-
+ WindowManager.getDefault().invokeWhenUIReady(this);
UIManager.put("EditorTabDisplayerUI", "org.fudaa.fudaa.crue.branding.NoTabsTabDisplayerUI");
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);
@@ -27,5 +98,4 @@
}
}
}
-
}
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2012-05-15 15:49:49 UTC (rev 7207)
@@ -44,6 +44,10 @@
</folder>
</folder>
<folder name="Toolbars">
+ <file name="Standard.xml_hidden"/>
+ <file name="toolbar.xml" url="toolbar.xml">
+ <attr intvalue="1" name="position"/>
+ </file>
<file name="Clipboard_hidden"/>
<file name="File_hidden"/>
<file name="Memory_hidden"/>
Added: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/toolbar.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/toolbar.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/toolbar.xml 2012-05-15 15:49:49 UTC (rev 7207)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configuration PUBLIC "-//NetBeans IDE//DTD toolbar 1.1//EN"
+ "http://www.netbeans.org/dtds/toolbar1_1.dtd">
+<Configuration>
+ <Row>
+ <Toolbar name="UndoRedo" visible="true" draggable="false" align="left" position="1"/>
+ <Toolbar name="Perspective" visible="true" draggable="false" align="left" position="2"/>
+ <Toolbar name="State" visible="true" draggable="false" align="left" position="3"/>
+ </Row>
+</Configuration>
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/EntiteProperty.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/EntiteProperty.java 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/EntiteProperty.java 2012-05-15 15:49:49 UTC (rev 7207)
@@ -5,7 +5,6 @@
package org.fudaa.fudaa.crue.common.log.property;
import java.lang.reflect.InvocationTargetException;
-import java.util.MissingResourceException;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLogRecord;
@@ -24,7 +23,7 @@
public EntiteProperty(CtuluLogRecord record) {
super(ID, String.class, getDefaultDisplayName(),
- getDescription());
+ getDescription());
this.record = record;
PropertyCrueUtils.configureNoCustomEditor(this);
}
@@ -36,8 +35,8 @@
public static String getDefaultDisplayName() {
return NbBundle.getMessage(EntiteProperty.class, "EntityPropertyName");
}
-
- public static PropertyColumnFilterable createColumn() {
+
+ public static PropertyColumnFilterable createColumn() {
PropertyColumnFilterable res = new PropertyColumnFilterable();
res.setColumnId(ID);
res.setDescription(getDescription());
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/FunctionProperty.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/FunctionProperty.java 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/FunctionProperty.java 2012-05-15 15:49:49 UTC (rev 7207)
@@ -48,11 +48,7 @@
@Override
public String toString() {
- Object[] args = record.getArgs();
- if (ArrayUtils.isNotEmpty(args)) {
- return (String) args[0];
- }
- return StringUtils.EMPTY;
+ return record.getRessourceFunction();
}
@Override
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml 2012-05-15 15:49:49 UTC (rev 7207)
@@ -8,7 +8,7 @@
</folder>
</folder>
<folder name="Toolbars">
- <folder name="Persective">
+ <folder name="Perspective">
<file name="org-fudaa-fudaa-crue-modelling-perspective-ActiveModelisation.shadow">
<attr name="originalFile" stringvalue="Actions/File/org-fudaa-fudaa-crue-modelling-perspective-ActiveModelisation.instance"/>
<attr intvalue="3" name="position"/>
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/layer.xml 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/layer.xml 2012-05-15 15:49:49 UTC (rev 7207)
@@ -10,7 +10,7 @@
</folder>
</folder>
<folder name="Toolbars">
- <folder name="Persective">
+ <folder name="Perspective">
<file name="org-fudaa-fudaa-crue-otfa-perspective-ActiveOtfa.shadow">
<attr name="originalFile" stringvalue="Actions/File/org-fudaa-fudaa-crue-otfa-perspective-ActiveOtfa.instance"/>
<attr intvalue="5" name="position"/>
Modified: trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/layer.xml 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/layer.xml 2012-05-15 15:49:49 UTC (rev 7207)
@@ -25,7 +25,7 @@
</folder>
</folder>
<folder name="Toolbars">
- <folder name="Persective">
+ <folder name="Perspective">
<file name="org-fudaa-fudaa-crue-post-perspective-ActivePost.shadow">
<attr name="originalFile" stringvalue="Actions/File/org-fudaa-fudaa-crue-post-perspective-ActivePost.instance"/>
<attr intvalue="4" name="position"/>
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-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml 2012-05-15 15:49:49 UTC (rev 7207)
@@ -75,16 +75,16 @@
</folder>
</folder>
<folder name="Toolbars">
- <folder name="Persective">
+ <!--Perspective repris dans toolbar.xml et dans InitGeneralUIInstaller-->
+ <folder name="Perspective">
+ <attr intvalue="2" name="position"/>
<file name="org-fudaa-fudaa-crue-study-perspective-ActiveStudy.shadow">
<attr name="originalFile" stringvalue="Actions/File/org-fudaa-fudaa-crue-study-perspective-ActiveStudy.instance"/>
<attr intvalue="2" name="position"/>
</file>
</folder>
-
-
+ <!--State repris dans toolbar.xml et dans InitGeneralUIInstaller-->
<folder name="State">
- <attr name="position" intvalue="3"/>
<file name="org-fudaa-fudaa-crue-study-services-GlobalStateManager.shadow">
<attr name="originalFile" stringvalue="Actions/File/org-fudaa-fudaa-crue-study-services-GlobalStateManager.instance"/>
<attr intvalue="1" name="position"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
