From 628d65e18122f203f6124f235d4e07affaf42a33 Mon Sep 17 00:00:00 2001
From: dblouin <dominique.blouin@telecom-paristech.fr>
Date: Mon, 4 Feb 2019 17:01:16 +0100
Subject: [PATCH] Made search text field private and added accessors for its
text
---
src/main/java/ui/JToolBarMainTurtle.java | 59 +++++++++++++-----------
src/main/java/ui/MainGUI.java | 5 +-
2 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/src/main/java/ui/JToolBarMainTurtle.java b/src/main/java/ui/JToolBarMainTurtle.java
index 58ef235ede..c926eb9a10 100644
--- a/src/main/java/ui/JToolBarMainTurtle.java
+++ b/src/main/java/ui/JToolBarMainTurtle.java
@@ -68,7 +68,7 @@ public class JToolBarMainTurtle extends JToolBar implements ActionListener
JButton checkcode, simulation, validation;
JButton oneClickrtlotos, onclicklotos, gensystemc, simusystemc, gentml, genC, genjava, nc,externalSearch, internalSearch;
- JTextField search;
+ private JTextField search;
MainGUI mgui;
@@ -79,7 +79,7 @@ public class JToolBarMainTurtle extends JToolBar implements ActionListener
}
// Menus
- private void buildToolBar(MainGUI mgui) {
+ private void buildToolBar(MainGUI mgui) {
JButton button;
button = add(mgui.actions[TGUIAction.ACT_NEW]);
@@ -114,7 +114,7 @@ public class JToolBarMainTurtle extends JToolBar implements ActionListener
button.addMouseListener(mgui.mouseHandler);
button = add(mgui.actions[TGUIAction.MOVE_ENABLED]);
button.addMouseListener(mgui.mouseHandler);
- button = add(mgui.actions[TGUIAction.FIRST_DIAGRAM]);
+ button = add(mgui.actions[TGUIAction.FIRST_DIAGRAM]);
button.addMouseListener(mgui.mouseHandler);
addSeparator();
@@ -279,15 +279,15 @@ public class JToolBarMainTurtle extends JToolBar implements ActionListener
addSeparator();
showAvatarActions(false);
- setSearch(new JTextField("", 10));
- getSearch().setEnabled(false);
- add(getSearch());
- getSearch().addActionListener(this);
+ search = new JTextField("", 10);
+ search.setEnabled(false);
+ add( search );
+ search.addActionListener(this);
- getSearch().getDocument().addDocumentListener(new DocumentListener() {
+ search.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent documentEvent) {
- if (getSearch().getText().length()>0){
+ if ( search.getText().length()>0){
internalSearch.setEnabled(true);
}else
internalSearch.setEnabled(false);
@@ -295,7 +295,7 @@ public class JToolBarMainTurtle extends JToolBar implements ActionListener
@Override
public void removeUpdate(DocumentEvent documentEvent) {
- if (getSearch().getText().length()>0){
+ if ( search.getText().length()>0){
internalSearch.setEnabled(true);
}else
internalSearch.setEnabled(false);
@@ -303,7 +303,6 @@ public class JToolBarMainTurtle extends JToolBar implements ActionListener
@Override
public void changedUpdate(DocumentEvent documentEvent) {
-
}
});
@@ -313,10 +312,6 @@ public class JToolBarMainTurtle extends JToolBar implements ActionListener
internalSearch.addMouseListener(mgui.mouseHandler);
externalSearch = add(mgui.actions[TGUIAction.ACT_EXTERNAL_SEARCH]);
externalSearch.addMouseListener(mgui.mouseHandler);
-
- //--
-
-
}
public void showAvatarActions(boolean b) {
@@ -471,26 +466,34 @@ public class JToolBarMainTurtle extends JToolBar implements ActionListener
}
public void actionPerformed(ActionEvent e) {
- if (e.getSource() == getSearch()) {
- String text = getSearch().getText();
+ if (e.getSource() == search ) {
+ String text = search.getText();
TraceManager.addDev("Searching elements with" + text);
if (text.length()>0) {
- getSearch().setEnabled(false);
+ search.setEnabled(false);
mgui.search(text);
- getSearch().setEnabled(true);
+ search.setEnabled(true);
}
}
}
public void activateSearch(boolean enabled) {
- getSearch().setEnabled(enabled);
+ search.setEnabled(enabled);
}
-
- public JTextField getSearch() {
- return search;
- }
-
- public void setSearch(JTextField search) {
- this.search = search;
- }
+
+ public String getSearchText() {
+ return search.getText();
+ }
+
+ public void setSearchText( final String text ) {
+ search.setText( text );
+ }
+//
+// public JTextField getSearch() {
+// return search;
+// }
+//
+// public void setSearch(JTextField search) {
+// this.search = search;
+// }
} // Class
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 995bbddb59..1f0bc32145 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -638,7 +638,6 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
// Issue #81: For tests when gtm could be null
if ( gtm != null &&
type != TDiagramPanel.SELECT_COMPONENT ) { // Issue #105
- TraceManager.addDev( "Saving current state for undo..." );
gtm.saveOperation(p);
}
@@ -3397,7 +3396,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
//@author: Huy TRUONG
//open a new External Search Dialog
public void showExternalSearch() {
- String textSearchField = mainBar.search.getText();
+ String textSearchField = mainBar.getSearchText();
List<String> listSearch = new ArrayList<String>();
if (null == this.searchBox) {
@@ -3424,7 +3423,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
}
public void doInternalSearch() {
- search(mainBar.search.getText());
+ search(mainBar.getSearchText());
}
public void aboutVersion() {
--
GitLab