Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7136] trunk/soft/fudaa-prepro/ui
|
From: <de...@us...> - 2012-05-02 12:05:34
|
Revision: 7136
http://fudaa.svn.sourceforge.net/fudaa/?rev=7136&view=rev
Author: deniger
Date: 2012-05-02 12:05:23 +0000 (Wed, 02 May 2012)
Log Message:
-----------
corrections mineures
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/pom.xml
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageCompositeEditorPanel.java
Modified: trunk/soft/fudaa-prepro/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/ui/pom.xml 2012-05-02 12:04:41 UTC (rev 7135)
+++ trunk/soft/fudaa-prepro/ui/pom.xml 2012-05-02 12:05:23 UTC (rev 7136)
@@ -1,110 +1,118 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>fudaa-prepro</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>prepro-ui</artifactId>
- <name>prepro-ui</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>meshview</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ebli</groupId>
- <artifactId>ebli-3d</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
- <artifactId>dico-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ebli</groupId>
- <artifactId>ebli-visuallibrary</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${dodicoGroupId}</groupId>
- <artifactId>dodico-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${ctuluGroupId}</groupId>
- <artifactId>ctulu-gis</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>fudaa-prepro</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>prepro-ui</artifactId>
+ <name>prepro-ui</name>
+ <dependencies>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>meshview</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ebli</groupId>
+ <artifactId>ebli-3d</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
+ <artifactId>dico-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ebli</groupId>
+ <artifactId>ebli-visuallibrary</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${dodicoGroupId}</groupId>
+ <artifactId>dodico-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${ctuluGroupId}</groupId>
+ <artifactId>ctulu-gis</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.fudaa.fudaa.tr.Tr</mainClass>
- </manifest>
- </archive>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.fudaa.fudaa.tr.Tr</mainClass>
+ </manifest>
+ </archive>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
- <plugins>
+ <plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <versionRange>[1.3,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <versionRange>[1.3,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
</pluginManagement>
- </build>
- <properties>
- <project.build.sourceEncoding>ISO-8859-15</project.build.sourceEncoding>
- </properties>
+ </build>
+ <properties>
+ <project.build.sourceEncoding>ISO-8859-15</project.build.sourceEncoding>
+ </properties>
</project>
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageCompositeEditorPanel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageCompositeEditorPanel.java 2012-05-02 12:04:41 UTC (rev 7135)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageCompositeEditorPanel.java 2012-05-02 12:05:23 UTC (rev 7136)
@@ -16,7 +16,6 @@
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableCellEditor;
-import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.CtuluNumberFormatDefault;
import org.fudaa.ctulu.CtuluUI;
@@ -46,32 +45,31 @@
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuResource;
-import com.memoire.bu.BuScrollPane;
-import com.memoire.bu.BuTable;
import com.memoire.bu.BuVerticalLayout;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.ScrollPaneConstants;
@SuppressWarnings("serial")
public class TrRubarOuvrageCompositeEditorPanel extends CtuluDialogPanel {
- public static boolean edit(H2dRubarGridAreteSource grid, H2dRubarOuvrageElementaireComposite ouvrage, H2dRubarOuvrage parent, CtuluUI ui) {
+ public static boolean edit(H2dRubarGridAreteSource grid, H2dRubarOuvrageElementaireComposite ouvrage, H2dRubarOuvrage parent,
+ CtuluUI ui) {
TrRubarOuvrageCompositeEditorPanel panel = new TrRubarOuvrageCompositeEditorPanel(grid, ouvrage, parent);
panel.setCtuluUi(ui);
panel.build();
return panel.afficheModaleOk(ui.getParentComponent());
}
-
private final H2dRubarGridAreteSource grid;
private BuLabel lbAmont;
-
private BuLabel lbAval;
private H2dRubarOuvrage parent;
-
private H2dRubarOuvrageElementaireComposite ouvrage;
-
CtuluUI ui;
private BuButton editValues;
- public TrRubarOuvrageCompositeEditorPanel(H2dRubarGridAreteSource grid, H2dRubarOuvrageElementaireComposite ouvrage, H2dRubarOuvrage parent) {
+ public TrRubarOuvrageCompositeEditorPanel(H2dRubarGridAreteSource grid, H2dRubarOuvrageElementaireComposite ouvrage,
+ H2dRubarOuvrage parent) {
this.grid = grid;
this.ouvrage = ouvrage;
this.parent = parent;
@@ -81,7 +79,8 @@
setLayout(new BuGridLayout(3, 5, 5));
addLabel(TrLib.getString("Contr\xF4le"));
- final BuComboBox cb = new BuComboBox(new Object[] { H2dRubarOuvrageCompositeTypeControle.TIME, H2dRubarOuvrageCompositeTypeControle.ELEVATION });
+ final BuComboBox cb = new BuComboBox(
+ new Object[]{H2dRubarOuvrageCompositeTypeControle.TIME, H2dRubarOuvrageCompositeTypeControle.ELEVATION});
cb.setRenderer(new CtuluCellTextRenderer() {
@Override
@@ -92,7 +91,6 @@
super.setValue(((H2dRubarOuvrageCompositeTypeControle) _value).getDesc());
}
}
-
});
add(cb);
cb.setSelectedItem(ouvrage.getTypeControle());
@@ -117,6 +115,7 @@
updateAmontLabel();
BuButton editAmont = new BuButton(BuResource.BU.getString("Editer"));
editAmont.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(ActionEvent e) {
editAmont();
@@ -129,6 +128,7 @@
updateAvalLabel();
BuButton editAval = new BuButton(BuResource.BU.getString("Editer"));
editAval.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(ActionEvent e) {
editAval();
@@ -245,7 +245,6 @@
protected Double[] getValues() {
return values;
}
-
}
protected void editValues() {
@@ -255,11 +254,13 @@
values[i] = valeurs[i];
}
DoubleTableModel tableModel = new DoubleTableModel(values, ouvrage.getTypeControle().getDesc());
- final BuTable table = new BuTable(tableModel);
+ final JTable table = new JTable(tableModel);
CtuluValueEditorDouble editor = new CtuluValueEditorDouble(false);
editor.setFormatter(CtuluNumberFormatDefault.DEFAULT_FMT_3DIGITS);
table.getColumnModel().getColumn(0).setCellEditor(editor.createTableEditorComponent());
+ table.getColumnModel().getColumn(0).setCellEditor(editor.createTableEditorComponent());
CtuluDialogPanel pn = new CtuluDialogPanel() {
+
@Override
public boolean isDataValid() {
TableCellEditor cellEditor = table.getCellEditor();
@@ -271,7 +272,11 @@
}
};
- pn.add(new BuScrollPane(table));
+ pn.setLayout(new BorderLayout());
+ final JScrollPane jScrollPane = new JScrollPane(table);
+ jScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+ jScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ pn.add(jScrollPane);
boolean ok = pn.afficheModaleOk(this, ouvrage.getTypeControle().getDesc());
if (ok) {
ouvrage.setValues(tableModel.getValues());
@@ -299,7 +304,8 @@
}
private String formatXY(double xAmont, double yAmont) {
- return CtuluNumberFormatDefault.DEFAULT_FMT_3DIGITS.format(xAmont) + ", " + CtuluNumberFormatDefault.DEFAULT_FMT_3DIGITS.format(yAmont);
+ return CtuluNumberFormatDefault.DEFAULT_FMT_3DIGITS.format(xAmont) + ", " + CtuluNumberFormatDefault.DEFAULT_FMT_3DIGITS.format(
+ yAmont);
}
public CtuluUI getUi() {
@@ -318,7 +324,7 @@
cq.addCalque(element);
cq.setCalqueActif(element);
if (initIdx >= 0) {
- element.setSelection(new int[] { initIdx });
+ element.setSelection(new int[]{initIdx});
}
final List l = cq.getController().getActions();
@@ -347,7 +353,6 @@
}
return valid;
}
-
};
pn.setLayout(new BorderLayout());
pn.setPreferredSize(new Dimension(500, 500));
@@ -402,5 +407,4 @@
lbAval.setToolTipText(lbAval.getText());
lbAval.setToolTipText(lbAval.getToolTipText());
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
