jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1413254 - in /jmeter/trunk/src/jorphan/org/apache: commons/cli/avalon/ commons/jexl/bsf/ jorphan/collections/ jorphan/gui/ jorphan/gui/layout/ jorphan/math/ jorphan/reflect/
Date Sat, 24 Nov 2012 19:51:24 GMT
Author: pmouawad
Date: Sat Nov 24 19:51:21 2012
New Revision: 1413254

URL: http://svn.apache.org/viewvc?rev=1413254&view=rev
Log:
Bug 54199 - Move to Java 6
add @Override
Bugzilla Id: 54199

Modified:
    jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/AbstractParserControl.java
    jmeter/trunk/src/jorphan/org/apache/commons/jexl/bsf/JexlEngine.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/gui/layout/VerticalLayout.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/math/NumberComparator.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java

Modified: jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/AbstractParserControl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/AbstractParserControl.java?rev=1413254&r1=1413253&r2=1413254&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/AbstractParserControl.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/AbstractParserControl.java Sat
Nov 24 19:51:21 2012
@@ -35,6 +35,7 @@ public abstract class AbstractParserCont
      * @return return true to halt, false to continue parsing
      * @see ParserControl#isFinished(int)
      */
+    @Override
     public boolean isFinished(int lastOptionCode) {
         return false;
     }

Modified: jmeter/trunk/src/jorphan/org/apache/commons/jexl/bsf/JexlEngine.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/commons/jexl/bsf/JexlEngine.java?rev=1413254&r1=1413253&r2=1413254&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/commons/jexl/bsf/JexlEngine.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/commons/jexl/bsf/JexlEngine.java Sat Nov 24 19:51:21
2012
@@ -81,6 +81,7 @@ public class JexlEngine extends BSFEngin
     }
 
     /** {@inheritDoc} */
+    @Override
     public Object eval(String fileName, int lineNo, int colNo, Object expr)
             throws BSFException {
         if (expr == null) {
@@ -131,6 +132,7 @@ public class JexlEngine extends BSFEngin
     }
 
     /** {@inheritDoc} */
+    @Override
     public Object call(Object object, String name, Object[] args)
             throws BSFException {
         try {

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java?rev=1413254&r1=1413253&r2=1413254&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java Sat Nov 24 19:51:21
2012
@@ -91,6 +91,7 @@ public class HashTree implements Seriali
      * @see #add(HashTree)
      * @see java.util.Map#putAll(Map)
      */
+    @Override
     public void putAll(Map<? extends Object, ? extends HashTree> map) {
         if (map instanceof HashTree) {
             this.add((HashTree) map);
@@ -104,6 +105,7 @@ public class HashTree implements Seriali
      *
      * @see java.util.Map#entrySet()
      */
+    @Override
     public Set<Entry<Object, HashTree>> entrySet() {
         return data.entrySet();
     }
@@ -117,6 +119,7 @@ public class HashTree implements Seriali
      * @return True if the HashTree contains the value, false otherwise.
      * @see java.util.Map#containsValue(Object)
      */
+    @Override
     public boolean containsValue(Object value) {
         return data.containsValue(value);
     }
@@ -130,6 +133,7 @@ public class HashTree implements Seriali
      *            to store against key
      * @see java.util.Map#put(Object, Object)
      */
+    @Override
     public HashTree put(Object key, HashTree value) {
         HashTree previous = data.get(key);
         add(key, value);
@@ -141,6 +145,7 @@ public class HashTree implements Seriali
      *
      * @see java.util.Map#clear()
      */
+    @Override
     public void clear() {
         data.clear();
     }
@@ -150,6 +155,7 @@ public class HashTree implements Seriali
      *
      * @see java.util.Map#values()
      */
+    @Override
     public Collection<HashTree> values() {
         return data.values();
     }
@@ -215,6 +221,7 @@ public class HashTree implements Seriali
      * @return True if the HashTree contains the key, false otherwise.
      * @see java.util.Map#containsKey(Object)
      */
+    @Override
     public boolean containsKey(Object o) {
         return data.containsKey(o);
     }
@@ -224,6 +231,7 @@ public class HashTree implements Seriali
      *
      * @return True if HashTree is empty, false otherwise.
      */
+    @Override
     public boolean isEmpty() {
         return data.isEmpty();
     }
@@ -575,6 +583,7 @@ public class HashTree implements Seriali
      *
      * @see java.util.Map#get(Object)
      */
+    @Override
     public HashTree get(Object key) {
         return getTree(key);
     }
@@ -700,6 +709,7 @@ public class HashTree implements Seriali
      *
      * @see java.util.Map#remove(Object)
      */
+    @Override
     public HashTree remove(Object key) {
         return data.remove(key);
     }
@@ -896,6 +906,7 @@ public class HashTree implements Seriali
      *
      * @see java.util.Map#keySet()
      */
+    @Override
     public Set<Object> keySet() {
         return data.keySet();
     }
@@ -942,6 +953,7 @@ public class HashTree implements Seriali
      *
      * @see java.util.Map#size()
      */
+    @Override
     public int size() {
         return data.size();
     }
@@ -1009,6 +1021,7 @@ public class HashTree implements Seriali
         }
 
         /** {@inheritDoc} */
+        @Override
         public void addNode(Object node, HashTree subTree) {
             result = subTree.getTree(target);
             if (result != null) {
@@ -1018,11 +1031,13 @@ public class HashTree implements Seriali
         }
 
         /** {@inheritDoc} */
+        @Override
         public void processPath() {
             // Not used
         }
 
         /** {@inheritDoc} */
+        @Override
         public void subtractNode() {
             // Not used
         }
@@ -1035,17 +1050,20 @@ public class HashTree implements Seriali
 
         private int depth = 0;
 
+        @Override
         public void addNode(Object key, HashTree subTree) {
             depth++;
             string.append("\n").append(getSpaces()).append(key);
             string.append(" {");
         }
 
+        @Override
         public void subtractNode() {
             string.append("\n" + getSpaces() + "}");
             depth--;
         }
 
+        @Override
         public void processPath() {
         }
 

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java?rev=1413254&r1=1413253&r2=1413254&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java Sat Nov 24
19:51:21 2012
@@ -92,6 +92,7 @@ public class SearchByClass<T> implements
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
+    @Override
     public void addNode(Object node, HashTree subTree) {
         if (searchClass.isAssignableFrom(node.getClass())) {
             objectsOfClass.add((T) node);
@@ -102,10 +103,12 @@ public class SearchByClass<T> implements
     }
 
     /** {@inheritDoc} */
+    @Override
     public void subtractNode() {
     }
 
     /** {@inheritDoc} */
+    @Override
     public void processPath() {
     }
 }
\ No newline at end of file

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java?rev=1413254&r1=1413253&r2=1413254&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java Sat Nov 24
19:51:21 2012
@@ -74,6 +74,7 @@ public abstract class AbstractTreeTableM
     /**
      * {@inheritDoc}
      */
+    @Override
     public Object getValueAt(Object node, int col) {
         return null;
     }
@@ -81,6 +82,7 @@ public abstract class AbstractTreeTableM
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isCellEditable(Object node, int col) {
         return false;
     }
@@ -88,6 +90,7 @@ public abstract class AbstractTreeTableM
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setValueAt(Object val, Object node, int column) {
     }
 

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java?rev=1413254&r1=1413253&r2=1413254&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java Sat Nov 24 19:51:21
2012
@@ -93,6 +93,7 @@ public class JLabeledChoice extends JPan
     /**
      * Get the label {@link JLabel} followed by the combo-box @link {@link JComboBox}.
      */
+    @Override
     public List<JComponent> getComponentList() {
         List<JComponent> comps = new LinkedList<JComponent>();
         comps.add(mLabel);
@@ -134,6 +135,7 @@ public class JLabeledChoice extends JPan
              * @param e
              *            The focus event that occured.
              */
+            @Override
             public void itemStateChanged(ItemEvent e) {
                 if (e.getStateChange() == ItemEvent.SELECTED) {
                     notifyChangeListeners();
@@ -163,6 +165,7 @@ public class JLabeledChoice extends JPan
      * @param pLabel
      *            The new label text.
      */
+    @Override
     public void setLabel(String pLabel) {
         mLabel.setText(pLabel);
     }
@@ -173,6 +176,7 @@ public class JLabeledChoice extends JPan
      * @param pText
      *            The new text to display in the text field.
      */
+    @Override
     public void setText(String pText) {
         choiceList.setSelectedItem(pText);
     }
@@ -185,6 +189,7 @@ public class JLabeledChoice extends JPan
      *
      * @return The text in the Text Field. Never returns null.
      */
+    @Override
     public String getText() {
         Object item = choiceList.getSelectedItem();
         if (item == null) {
@@ -251,6 +256,7 @@ public String getToolTipText() {
      * @param pChangeListener
      *            The listener to add
      */
+   @Override
     public void addChangeListener(ChangeListener pChangeListener) {
         mChangeListeners.add(pChangeListener);
     }
@@ -277,7 +283,7 @@ public String getToolTipText() {
     }
 
     private class AddListener implements ActionListener {
-
+        @Override
         public void actionPerformed(ActionEvent e) {
             Object item = choiceList.getSelectedItem();
             int index = choiceList.getSelectedIndex();
@@ -290,7 +296,7 @@ public String getToolTipText() {
     }
 
     private class DeleteListener implements ActionListener {
-
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (choiceList.getItemCount() > 1) {
                 choiceList.removeItemAt(choiceList.getSelectedIndex());

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java?rev=1413254&r1=1413253&r2=1413254&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java Sat Nov 24 19:51:21
2012
@@ -91,6 +91,7 @@ public class JLabeledTextArea extends JP
     /**
      * Get the label {@link JLabel} followed by the text field @link {@link JTextArea}.
      */
+    @Override
     public List<JComponent> getComponentList() {
         List<JComponent> comps = new LinkedList<JComponent>();
         comps.add(mLabel);
@@ -128,6 +129,7 @@ public class JLabeledTextArea extends JP
      * @param pFocusEvent
      *            The focus event that occured.
      */
+    @Override
     public void focusLost(FocusEvent pFocusEvent) {
         // Compare if the value has changed, since we received focus.
         if (!oldValue.equals(mTextArea.getText())) {
@@ -138,6 +140,7 @@ public class JLabeledTextArea extends JP
     /**
      * Catch what the value was when focus was gained.
      */
+    @Override
     public void focusGained(FocusEvent pFocusEvent) {
         oldValue = mTextArea.getText();
     }
@@ -148,6 +151,7 @@ public class JLabeledTextArea extends JP
      * @param pLabel
      *            The new label text.
      */
+    @Override
     public void setLabel(String pLabel) {
         mLabel.setText(pLabel);
     }
@@ -158,6 +162,7 @@ public class JLabeledTextArea extends JP
      * @param pText
      *            The new text to display in the text field.
      */
+    @Override
     public void setText(String pText) {
         mTextArea.setText(pText);
     }
@@ -167,6 +172,7 @@ public class JLabeledTextArea extends JP
      *
      * @return The text in the Text Field.
      */
+    @Override
     public String getText() {
         return mTextArea.getText();
     }
@@ -216,6 +222,7 @@ public class JLabeledTextArea extends JP
      * @param pChangeListener
      *            The listener to add
      */
+    @Override
     public void addChangeListener(ChangeListener pChangeListener) {
         mChangeListeners.add(pChangeListener);
     }

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java?rev=1413254&r1=1413253&r2=1413254&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java Sat Nov 24 19:51:21
2012
@@ -92,6 +92,7 @@ public class JLabeledTextField extends J
     /**
      * Get the label {@link JLabel} followed by the text field @link {@link JTextField}.
      */
+    @Override
     public List<JComponent> getComponentList() {
         List<JComponent> comps = new LinkedList<JComponent>();
         comps.add(mLabel);
@@ -131,6 +132,7 @@ public class JLabeledTextField extends J
      * @param pFocusEvent
      *            The focus event that occured.
      */
+    @Override
     public void focusLost(FocusEvent pFocusEvent) {
         // Compare if the value has changed, since we received focus.
         if (!oldValue.equals(mTextField.getText())) {
@@ -141,6 +143,7 @@ public class JLabeledTextField extends J
     /**
      * Catch what the value was when focus was gained.
      */
+    @Override
     public void focusGained(FocusEvent pFocusEvent) {
         oldValue = mTextField.getText();
     }
@@ -151,6 +154,7 @@ public class JLabeledTextField extends J
      * @param pLabel
      *            The new label text.
      */
+    @Override
     public void setLabel(String pLabel) {
         mLabel.setText(pLabel);
     }
@@ -161,6 +165,7 @@ public class JLabeledTextField extends J
      * @param pText
      *            The new text to display in the text field.
      */
+    @Override
     public void setText(String pText) {
         mTextField.setText(pText);
     }
@@ -170,6 +175,7 @@ public class JLabeledTextField extends J
      *
      * @return The text in the Text Field.
      */
+    @Override
     public String getText() {
         return mTextField.getText();
     }
@@ -216,6 +222,7 @@ public class JLabeledTextField extends J
      * @param pChangeListener
      *            The listener to add
      */
+    @Override
     public void addChangeListener(ChangeListener pChangeListener) {
         mChangeListeners.add(pChangeListener);
     }

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/layout/VerticalLayout.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/layout/VerticalLayout.java?rev=1413254&r1=1413253&r2=1413254&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/layout/VerticalLayout.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/layout/VerticalLayout.java Sat Nov 24
19:51:21 2012
@@ -148,6 +148,7 @@ public class VerticalLayout implements L
     /**
      * Lays out the container.
      */
+    @Override
     public void layoutContainer(Container parent) {
         Insets insets = parent.getInsets();
         // NOTUSED Dimension dim = layoutSize(parent, false);
@@ -189,10 +190,12 @@ public class VerticalLayout implements L
         }
     }
 
+    @Override
     public Dimension minimumLayoutSize(Container parent) {
         return layoutSize(parent, true);
     }
 
+    @Override
     public Dimension preferredLayoutSize(Container parent) {
         return layoutSize(parent, false);
     }
@@ -200,12 +203,14 @@ public class VerticalLayout implements L
     /**
      * Not used by this class.
      */
+    @Override
     public void addLayoutComponent(String name, Component comp) {
     }
 
     /**
      * Not used by this class.
      */
+    @Override
     public void removeLayoutComponent(Component comp) {
     }
 

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/math/NumberComparator.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/math/NumberComparator.java?rev=1413254&r1=1413253&r2=1413254&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/math/NumberComparator.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/math/NumberComparator.java Sat Nov 24 19:51:21
2012
@@ -33,6 +33,7 @@ public class NumberComparator implements
     }
 
     /** {@inheritDoc} */
+    @Override
     public int compare(Number[] n1, Number[] n2) {
         if (n1[0].longValue() < n2[0].longValue()) {
             return -1;

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java?rev=1413254&r1=1413253&r2=1413254&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java Sat Nov 24 19:51:21
2012
@@ -170,6 +170,7 @@ public final class ClassFinder {
                 File dir = new File(path);
                 if (dir.exists() && dir.isDirectory()) {
                     String[] jars = dir.list(new FilenameFilter() {
+                        @Override
                         public boolean accept(File f, String name) {
                             return name.endsWith(DOT_JAR);
                         }



Mime
View raw message