|
From: <de...@us...> - 2012-09-19 17:05:11
|
Revision: 7647
http://fudaa.svn.sourceforge.net/fudaa/?rev=7647&view=rev
Author: deniger
Date: 2012-09-19 17:05:02 +0000 (Wed, 19 Sep 2012)
Log Message:
-----------
recherche
Modified Paths:
--------------
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluCellTextRenderer.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/find/CalqueFindActionAbstract.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/find/EbliFindActionAbstract.java
Added Paths:
-----------
trunk/framework/ebli-2d/nbactions.xml
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluCellTextRenderer.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluCellTextRenderer.java 2012-09-19 17:03:51 UTC (rev 7646)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluCellTextRenderer.java 2012-09-19 17:05:02 UTC (rev 7647)
@@ -26,6 +26,7 @@
*/
@SuppressWarnings("serial")
public class CtuluCellTextRenderer extends JLabel implements CtuluCellRenderer, TreeCellRenderer {
+
private CtuluCellDecorator decorator_;
public CtuluCellTextRenderer() {
@@ -37,8 +38,6 @@
setDecorator(_deco);
setOpaque(true);
setBorder(BORDER_NO_FOCUS);
-/* setHorizontalTextPosition(SwingConstants.RIGHT);
- setHorizontalAlignment(SwingConstants.RIGHT);*/
}
public void updateUI() {
@@ -48,7 +47,7 @@
}
public Component getTableCellRendererComponent(final JTable _table, final Object _value, final boolean _isSelected,
- final boolean _hasFocus, final int _row, final int _column) {
+ final boolean _hasFocus, final int _row, final int _column) {
CtuluCellBooleanRenderer.updateRenderer(this, _table, _isSelected, _hasFocus, _row, _column);
if (!_isSelected) {
super.setForeground(_table.getForeground());
@@ -61,19 +60,23 @@
return this;
}
- public void validate() {}
+ public void validate() {
+ }
/**
* Overridden for performance reasons. See the <a href="#override">Implementation Note</a> for more information.
*/
- public void revalidate() {}
+ public void revalidate() {
+ }
/**
* Overridden for performance reasons. See the <a href="#override">Implementation Note</a> for more information.
*/
- public void repaint(final long _tm, final int _x, final int _y, final int _width, final int _height) {}
+ public void repaint(final long _tm, final int _x, final int _y, final int _width, final int _height) {
+ }
- public void repaint(final Rectangle _r) {}
+ public void repaint(final Rectangle _r) {
+ }
protected void firePropertyChange(final String _propertyName, final Object _oldValue, final Object _newValue) {
if ("text".equals(_propertyName)) {
@@ -81,14 +84,15 @@
}
}
- public void firePropertyChange(final String _propertyName, final boolean _oldValue, final boolean _newValue) {}
+ public void firePropertyChange(final String _propertyName, final boolean _oldValue, final boolean _newValue) {
+ }
protected void setValue(final Object _value) {
setText((_value == null) ? CtuluLibString.EMPTY_STRING : _value.toString());
}
public Component getListCellRendererComponent(final JList _list, final Object _value, final int _index,
- final boolean _isSelected, final boolean _cellHasFocus) {
+ final boolean _isSelected, final boolean _cellHasFocus) {
CtuluCellBooleanRenderer.updateListCellRenderer(this, _list, _index, _isSelected, _cellHasFocus);
setValue(_value);
if (decorator_ != null) {
@@ -96,12 +100,11 @@
}
return this;
}
-
Color treeSelectionForeground_;
Color treeSelectionBackground_;
public Component getTreeCellRendererComponent(final JTree _tree, final Object _value, final boolean _selected,
- final boolean _expanded, final boolean _leaf, final int _row, final boolean _hasFocus) {
+ final boolean _expanded, final boolean _leaf, final int _row, final boolean _hasFocus) {
if (treeSelectionForeground_ == null) {
treeSelectionForeground_ = UIManager.getColor("Tree.selectionForeground");
}
Added: trunk/framework/ebli-2d/nbactions.xml
===================================================================
--- trunk/framework/ebli-2d/nbactions.xml (rev 0)
+++ trunk/framework/ebli-2d/nbactions.xml 2012-09-19 17:05:02 UTC (rev 7647)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+ <action>
+ <actionName>CUSTOM-deploy</actionName>
+ <displayName>deploy</displayName>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ </action>
+ </actions>
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java 2012-09-19 17:03:51 UTC (rev 7646)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java 2012-09-19 17:05:02 UTC (rev 7647)
@@ -534,16 +534,10 @@
public final void inverseSelection() {
getScene().inverseSelection();
- // if (getCalqueActif() instanceof ZCalqueAffichageDonneesInterface) {
- // ((ZCalqueAffichageDonneesInterface) getCalqueActif()).inverseSelection();
- // }
}
public final void clearSelection() {
getScene().clearSelection();
- // if (getCalqueActif() instanceof ZCalqueAffichageDonneesInterface) {
- // ((ZCalqueAffichageDonneesInterface) getCalqueActif()).clearSelection();
- // }
}
public final ZEbliCalquePanelController getController() {
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/find/CalqueFindActionAbstract.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/find/CalqueFindActionAbstract.java 2012-09-19 17:03:51 UTC (rev 7646)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/find/CalqueFindActionAbstract.java 2012-09-19 17:05:02 UTC (rev 7647)
@@ -25,7 +25,6 @@
import org.fudaa.ebli.calque.ZCalqueSondeInterface;
import org.fudaa.ebli.calque.ZEbliCalquesPanel;
import org.fudaa.ebli.commun.EbliLib;
-import org.fudaa.ebli.commun.EbliSelectionMode;
import org.fudaa.ebli.commun.EbliSelectionState;
import org.fudaa.ebli.find.EbliFindActionAbstract;
import org.fudaa.ebli.find.EbliFindComponent;
@@ -36,7 +35,6 @@
import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.ebli.geometrie.GrPoint;
import org.fudaa.ebli.ressource.EbliResource;
-import org.jdom.Parent;
/**
* @author deniger
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/find/EbliFindActionAbstract.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/find/EbliFindActionAbstract.java 2012-09-19 17:03:51 UTC (rev 7646)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/find/EbliFindActionAbstract.java 2012-09-19 17:05:02 UTC (rev 7647)
@@ -10,9 +10,6 @@
import gnu.trove.TIntHashSet;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import java.util.StringTokenizer;
import com.memoire.fu.Fu;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|