fudaa-svn-commit Mailing List for Fudaa (Page 32)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 8501
          http://sourceforge.net/p/fudaa/svn/8501
Author:   deniger
Date:     2013-09-13 09:40:23 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
corrections minor bugs

Modified Paths:
--------------
    trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/find/EbliFindDialog.java

Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/find/EbliFindDialog.java
===================================================================

--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/find/EbliFindDialog.java	2013-09-13 09:22:47 UTC (rev 8500)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/find/EbliFindDialog.java	2013-09-13 09:40:23 UTC (rev 8501)
@@ -62,7 +62,6 @@
       super();
       this.selectModeModel = selectModeModel;
     }
-
     BuIcon add_ = BuResource.BU.getToolIcon("ajouter");
     BuIcon and_ = EbliResource.EBLI.getToolIcon("selection-and");
     BuIcon remove_ = BuResource.BU.getToolIcon("enlever");
@@ -76,23 +75,23 @@
       if (_value != null) {
         final Integer i = (Integer) _value;
         switch (i.intValue()) {
-        case EbliSelectionState.ACTION_ADD:
-          txt = selectModeModel.isValueSonde() ? ADD_SONDE : ADD;
-          ic = add_;
-          break;
-        case EbliSelectionState.ACTION_DEL:
-          txt = DEL;
-          ic = remove_;
-          break;
-        case EbliSelectionState.ACTION_REPLACE:
-          txt = selectModeModel.isValueSonde() ? REPLACE_SONDE : REPLACE;
-          ic = set_;
-          break;
-        case EbliSelectionState.ACTION_AND:
-          txt = AND;
-          ic = and_;
-          break;
-        default:
+          case EbliSelectionState.ACTION_ADD:
+            txt = selectModeModel.isValueSonde() ? ADD_SONDE : ADD;
+            ic = add_;
+            break;
+          case EbliSelectionState.ACTION_DEL:
+            txt = DEL;
+            ic = remove_;
+            break;
+          case EbliSelectionState.ACTION_REPLACE:
+            txt = selectModeModel.isValueSonde() ? REPLACE_SONDE : REPLACE;
+            ic = set_;
+            break;
+          case EbliSelectionState.ACTION_AND:
+            txt = AND;
+            ic = and_;
+            break;
+          default:
         }
         setText(txt);
         setIcon(ic);
@@ -106,14 +105,13 @@
     Integer[] values_;
     Integer[] valuesSonde_;
     Integer[] valuesNormal_;
-
     Integer lastSondeValue = Integer.valueOf(0);
     Integer lastNormalValue = Integer.valueOf(0);
 
     public SelectionModeModel() {
-      valuesNormal_ = new Integer[] { new Integer(EbliSelectionState.ACTION_REPLACE),
-          new Integer(EbliSelectionState.ACTION_ADD), new Integer(EbliSelectionState.ACTION_DEL),
-          new Integer(EbliSelectionState.ACTION_AND) };
+      valuesNormal_ = new Integer[]{new Integer(EbliSelectionState.ACTION_REPLACE),
+        new Integer(EbliSelectionState.ACTION_ADD), new Integer(EbliSelectionState.ACTION_DEL),
+        new Integer(EbliSelectionState.ACTION_AND)};
       values_ = valuesNormal_;
       selected_ = values_[0];
     }
@@ -126,8 +124,8 @@
       if (b && values_ != valuesSonde_) {
         lastNormalValue = (Integer) getSelectedItem();
         if (valuesSonde_ == null) {
-          valuesSonde_ = new Integer[] { new Integer(EbliSelectionState.ACTION_REPLACE),
-              new Integer(EbliSelectionState.ACTION_ADD) };
+          valuesSonde_ = new Integer[]{new Integer(EbliSelectionState.ACTION_REPLACE),
+            new Integer(EbliSelectionState.ACTION_ADD)};
         }
         values_ = valuesSonde_;
         fireIntervalRemoved(this, valuesSonde_.length, valuesNormal_.length - 1);
@@ -165,19 +163,15 @@
   public final static boolean isCalqueFindable(final Object _findable) {
     return (_findable instanceof EbliFindableItem) && ((EbliFindableItem) _findable).getFinder() != null;
   }
-
   JComponent active_;
-
   BuButton btSearch_;
   JCheckBox cbEdit_;
   SelectionModeModel cbMode_;
   JComboBox cbSelectMode_;
   ComboBoxModel cbSelectModeModel_;
   JCheckBox cbZoom_;
-
   EbliFindActionInterface currentAct_;
   CtuluEnhancedDialog dial_;
-
   KeyListener enterListener_;
   EbliFindComponent findCmp_;
   BuPanel pnCenter_;
@@ -221,14 +215,14 @@
     cbSelectMode_.setRenderer(new SelectComboboxRenderer(cbMode_));
     pnCenter_.add(cbSelectMode_);
     cbSelectMode_.addItemListener(new ItemListener() {
-
       public void itemStateChanged(final ItemEvent _e) {
         if (currentAct_ != null && _e.getStateChange() == ItemEvent.SELECTED) {
           afficheInutileTest();
         }
       }
     });
-    lbResults_ = new BuLabel(CtuluLibString.ESPACE);
+    lbResults_ = new BuLabel("R\xE9sultat recherche");
+    lbResults_.setMinimumSize(new Dimension(30, 15));
     lbResults_.setHorizontalTextPosition(SwingConstants.CENTER);
     lbResults_.setHorizontalAlignment(SwingConstants.CENTER);
     pnCenter_.add(lbResults_);
@@ -313,9 +307,9 @@
   protected KeyListener getEnterAction() {
     if (enterListener_ == null) {
       enterListener_ = new KeyListener() {
+        public void keyPressed(final KeyEvent _e) {
+        }
 
-        public void keyPressed(final KeyEvent _e) {}
-
         public void keyReleased(final KeyEvent _e) {
           if (_e.getKeyCode() == KeyEvent.VK_ENTER) {
             find();
@@ -323,7 +317,6 @@
         }
 
         public void keyTyped(final KeyEvent _e) {
-
         }
       };
     }
@@ -350,7 +343,6 @@
   public void affiche(final Component _parent) {
     if (dial_ == null) {
       dial_ = new CtuluEnhancedDialog(CtuluLibSwing.getFrameAncestorHelper(_parent)) {
-
         @Override
         public void cancel() {
           setVisible(false);
@@ -369,9 +361,10 @@
       }
       dial_.setTitle(BuResource.BU.getString("Rechercher"));
       dial_.setName("mvFindDialog");
+      clearResult();
       dial_.pack();
     }
-
+    clearResult();
     final Dimension dialogSize = dial_.getSize();
     final Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
     dial_.setLocation((screenSize.width - dialogSize.width) / 2, (screenSize.height - dialogSize.height) / 2);
@@ -390,17 +383,22 @@
   }
 
   protected void clearResult() {
-    lbResults_.setText(CtuluLibString.EMPTY_STRING);
+    lbResults_.setText(CtuluLibString.ESPACE);
   }
 
   protected void setResultText(final String _s) {
     lbResults_.setForeground(CtuluLibSwing.getDefaultLabelForegroundColor());
     lbResults_.setText(_s);
+    if (dial_ != null) {
+      dial_.pack();
+    }
   }
 
   public void find() {
     clearResult();
-    if (currentAct_ == null) { return; }
+    if (currentAct_ == null) {
+      return;
+    }
     if (!"SONDE".equals(findCmp_.getSearchId()) && isInutileSearch()) {
       afficheInutileTest();
       return;
@@ -408,7 +406,7 @@
     final String err = currentAct_.erreur(findCmp_.getFindQuery(), findCmp_.getSearchId(), visu_);
     visu_.setSelected((EbliFindableItem) cbSelectModeModel_.getSelectedItem());
     if (currentAct_.find(findCmp_.getFindQuery(), findCmp_.getSearchId(), ((Integer) cbMode_.getSelectedItem())
-        .intValue(), visu_)) {
+            .intValue(), visu_)) {
       if (err != null) {
         setErrorText(BuResource.BU.getString("Avertissement:") + CtuluLibString.ESPACE + err);
       }
@@ -440,7 +438,7 @@
   public boolean isInutileSearch() {
     final int i = ((Integer) cbMode_.getSelectedItem()).intValue();
     return (i == EbliSelectionState.ACTION_AND || i == EbliSelectionState.ACTION_DEL)
-        && (currentAct_.getCalque()).isSelectionEmpty();
+            && (currentAct_.getCalque()).isSelectionEmpty();
   }
 
   public void itemStateChanged(final ItemEvent _evt) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2008	Jan	Feb	Mar	Apr	May	Jun (46)	Jul (37)	Aug (154)	Sep (140)	Oct (132)	Nov (104)	Dec (67)
2009	Jan (113)	Feb (73)	Mar (102)	Apr (106)	May (114)	Jun (67)	Jul (116)	Aug (48)	Sep (108)	Oct (296)	Nov (56)	Dec (53)
2010	Jan (95)	Feb (31)	Mar (40)	Apr (12)	May (10)	Jun (27)	Jul (19)	Aug (81)	Sep (48)	Oct (45)	Nov (40)	Dec (7)
2011	Jan (16)	Feb (32)	Mar (55)	Apr (38)	May (24)	Jun (37)	Jul (12)	Aug (16)	Sep (97)	Oct (90)	Nov (101)	Dec (89)
2012	Jan (18)	Feb (2)	Mar (54)	Apr (69)	May (97)	Jun (131)	Jul (70)	Aug (48)	Sep (48)	Oct (119)	Nov (194)	Dec (60)
2013	Jan (73)	Feb (35)	Mar (42)	Apr (28)	May (7)	Jun (17)	Jul (27)	Aug (10)	Sep (38)	Oct (12)	Nov (4)	Dec (16)
2014	Jan (33)	Feb (37)	Mar (19)	Apr (3)	May (47)	Jun (26)	Jul (22)	Aug	Sep (10)	Oct (30)	Nov (24)	Dec (19)
2015	Jan (13)	Feb (16)	Mar (36)	Apr (19)	May (5)	Jun (5)	Jul (3)	Aug (11)	Sep (22)	Oct (7)	Nov (14)	Dec
2016	Jan	Feb (26)	Mar (13)	Apr (61)	May	Jun	Jul (4)	Aug	Sep	Oct (27)	Nov (14)	Dec (21)
2017	Jan (30)	Feb (4)	Mar (3)	Apr (5)	May (69)	Jun (29)	Jul (1)	Aug	Sep	Oct	Nov	Dec

fudaa-svn-commit Mailing List for Fudaa (Page 32)

https://gitlab.com/fudaa

fudaa-svn-commit — svn commit with diffs