summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-05 09:54:58 +0200
committerNoel Grandin <noel@peralex.com>2014-08-05 11:31:50 +0200
commit0c5f51ebbcb7e22baa913e2012e3dcfcc6cf7897 (patch)
tree3d441110176e37c1a6ba2d15a3653d5023863075 /toolkit
parentd26540bb05b0443e7988da34372c86f88cbf1f6c (diff)
java: remove commented out code
Change-Id: I44e2043e5da23bc9421c03e550ef1d8b7ebaad36
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/qa/complex/toolkit/UnitConversion.java5
-rw-r--r--toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java12
-rw-r--r--toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java5
-rw-r--r--toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java6
-rw-r--r--toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java7
-rw-r--r--toolkit/test/accessibility/AccTreeNode.java2
-rw-r--r--toolkit/test/accessibility/AccessibilityTree.java2
-rw-r--r--toolkit/test/accessibility/CanvasShape.java1
-rw-r--r--toolkit/test/accessibility/NodeHandler.java9
-rw-r--r--toolkit/test/accessibility/TextUpdateListener.java40
-rw-r--r--toolkit/test/accessibility/tools/NameProvider.java2
11 files changed, 1 insertions, 90 deletions
diff --git a/toolkit/qa/complex/toolkit/UnitConversion.java b/toolkit/qa/complex/toolkit/UnitConversion.java
index 06e3a35375e6..430bd7ef556a 100644
--- a/toolkit/qa/complex/toolkit/UnitConversion.java
+++ b/toolkit/qa/complex/toolkit/UnitConversion.java
@@ -187,13 +187,8 @@ public class UnitConversion
checkSize(aSize, com.sun.star.util.MeasureUnit.INCH_100TH, "1/100inch");
checkSize(aSize, com.sun.star.util.MeasureUnit.INCH_10TH, "1/10inch");
checkSize(aSize, com.sun.star.util.MeasureUnit.INCH, "inch");
- // checkSize(aSize, com.sun.star.util.MeasureUnit.M, "m");
checkSize(aSize, com.sun.star.util.MeasureUnit.POINT, "point");
checkSize(aSize, com.sun.star.util.MeasureUnit.TWIP, "twip");
- // checkSize(aSize, com.sun.star.util.MeasureUnit.KM, "km");
- // checkSize(aSize, com.sun.star.util.MeasureUnit.PICA, "pica");
- // checkSize(aSize, com.sun.star.util.MeasureUnit.FOOT, "foot");
- // checkSize(aSize, com.sun.star.util.MeasureUnit.MILE, "mile");
}
catch (com.sun.star.lang.IllegalArgumentException e)
{
diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java
index b981886ce332..ee13d01092ed 100644
--- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java
@@ -47,8 +47,6 @@ import com.sun.star.uno.XInterface;
*/
public class _XAccessibleComponent {
- // private LogWriter log;
-
public XAccessibleComponent oObj = null;
private Rectangle bounds = null ;
@@ -60,7 +58,6 @@ public class _XAccessibleComponent {
public _XAccessibleComponent(XInterface object/*, LogWriter log*/) {
oObj = UnoRuntime.queryInterface(
XAccessibleComponent.class, object);
- // this.log = log;
}
/**
@@ -83,11 +80,9 @@ public class _XAccessibleComponent {
boolean result = true ;
int curX = 0;
- //while (!oObj.containsPoint(new Point(curX, bounds.Y)) && curX < bounds.Width+bounds.X) {
while (!oObj.containsPoint(new Point(curX, 0)) && curX < bounds.Width) {
curX++;
}
- //if ((bounds.X <= curX) && (curX < bounds.Width+bounds.X)) {
if (curX < bounds.Width) {
System.out.println("Upper bound of box contains point ("
+ curX + ",0) - OK");
@@ -98,14 +93,12 @@ public class _XAccessibleComponent {
}
curX = 0;
- //while (!oObj.containsPoint(new Point(curX, bounds.Y+bounds.Height - 1))
while (!oObj.containsPoint(new Point(curX, bounds.Height - 1))
&& curX < bounds.Width) {
System.out.println("Contains returns false for ("+curX+","+bounds.Height+")");
curX++;
}
- //if ((bounds.X <= curX) && (curX < bounds.Width+bounds.X)) {
if (curX < bounds.Width) {
System.out.println("Lower bound of box contains point ("
+ curX + "," + (bounds.Height - 1) + ") - OK");
@@ -116,11 +109,9 @@ public class _XAccessibleComponent {
}
int curY = 0;
- //while (!oObj.containsPoint(new Point(bounds.X, curY)) && curY < bounds.Height+bounds.Y) {
while (!oObj.containsPoint(new Point(0, curY)) && curY < bounds.Height) {
curY++;
}
- //if ((bounds.Y <= curY) && (curY < bounds.Height+bounds.Y)) {
if (curY < bounds.Height) {
System.out.println("Left bound of box contains point (0,"
+ curY + ") - OK");
@@ -131,12 +122,9 @@ public class _XAccessibleComponent {
}
curY = 0;
- //while (!oObj.containsPoint(new Point(bounds.X+bounds.Width - 1, curY))
- // && curY < bounds.Height+bounds.Y) {
while (!oObj.containsPoint(new Point(bounds.Width - 1, curY)) && curY < bounds.Height) {
curY++;
}
- //if ((bounds.Y <= curY) && (curY < bounds.Height + bounds.Y)) {
if (curY < bounds.Height) {
System.out.println("Right bound of box contains point ("
+ (bounds.Width - 1) + "," + curY + ") - OK");
diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java
index 71f746f94e82..42c23dd5194c 100644
--- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java
@@ -26,9 +26,7 @@ import com.sun.star.accessibility.XAccessible;
import com.sun.star.accessibility.XAccessibleContext;
import com.sun.star.accessibility.XAccessibleRelationSet;
import com.sun.star.accessibility.XAccessibleStateSet;
-// import com.sun.star.accessibility.AccessibleRelationType;
import util.AccessibilityTools;
-// import share.LogWriter;
/**
* Testing <code>com.sun.star.accessibility.XAccessibleContext</code>
@@ -50,8 +48,6 @@ import util.AccessibilityTools;
*/
public class _XAccessibleContext {
- // private LogWriter log;
-
public XAccessibleContext oObj = null;
private int childCount = 0;
@@ -59,7 +55,6 @@ public class _XAccessibleContext {
public _XAccessibleContext(XInterface object) {
oObj = UnoRuntime.queryInterface(XAccessibleContext.class, object);
- // this.log = log;
}
/**
diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java
index 3199f8171512..aab89b01e0cb 100644
--- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java
@@ -18,14 +18,10 @@
package complex.toolkit.accessibility;
-// import lib.MultiMethodTest;
import com.sun.star.accessibility.XAccessibleExtendedComponent;
-// import com.sun.star.accessibility.XAccessibleStateSet;
-// import com.sun.star.accessibility.AccessibleStateType;
import com.sun.star.awt.XFont;
import com.sun.star.uno.XInterface;
import com.sun.star.uno.UnoRuntime;
-// import share.LogWriter;
/**
* Testing <code>com.sun.star.accessibility.XAccessibleExtendedComponent</code>
@@ -42,7 +38,6 @@ import com.sun.star.uno.UnoRuntime;
*/
public class _XAccessibleExtendedComponent {
- // private LogWriter log;
private static final String className =
"com.sun.star.accessibility.XAccessibleExtendedComponent" ;
@@ -55,7 +50,6 @@ public class _XAccessibleExtendedComponent {
public _XAccessibleExtendedComponent(XInterface object/*, LogWriter log*/) {
oObj = UnoRuntime.queryInterface(XAccessibleExtendedComponent.class, object);
- // this.log = log;
}
/**
diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java
index 6de3a08485ec..33a4f7904a18 100644
--- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java
@@ -19,9 +19,6 @@
package complex.toolkit.accessibility;
import com.sun.star.accessibility.XAccessibleText;
-// import lib.MultiMethodTest;
-//import lib.StatusException;
-//import lib.Status;
import com.sun.star.beans.PropertyValue;
import com.sun.star.awt.Rectangle;
import com.sun.star.awt.Point;
@@ -30,7 +27,6 @@ import com.sun.star.accessibility.AccessibleTextType;
import com.sun.star.accessibility.TextSegment;
import com.sun.star.uno.XInterface;
import com.sun.star.uno.UnoRuntime;
-// import share.LogWriter;
/**
* Testing <code>com.sun.star.accessibility.XAccessibleText</code>
@@ -67,8 +63,6 @@ import com.sun.star.uno.UnoRuntime;
*/
public class _XAccessibleText {
- // private LogWriter log;
-
public XAccessibleText oObj = null;
private XMultiServiceFactory xMSF;
@@ -82,7 +76,6 @@ public class _XAccessibleText {
public _XAccessibleText(XInterface object, XMultiServiceFactory xMSF, String editOnly) {
oObj = UnoRuntime.queryInterface(XAccessibleText.class, object);
this.xMSF = xMSF;
- // this.log = log;
this.editOnly = editOnly;
}
diff --git a/toolkit/test/accessibility/AccTreeNode.java b/toolkit/test/accessibility/AccTreeNode.java
index 50fc1b55cf2d..af1c333cf05b 100644
--- a/toolkit/test/accessibility/AccTreeNode.java
+++ b/toolkit/test/accessibility/AccTreeNode.java
@@ -274,7 +274,7 @@ class AccTreeNode
handlers show no children */
public boolean isLeaf()
{
- return (maHandlers.size() == 0);// || (getChildCount() == 0);
+ return (maHandlers.size() == 0);
}
public boolean equals (Object aOther)
diff --git a/toolkit/test/accessibility/AccessibilityTree.java b/toolkit/test/accessibility/AccessibilityTree.java
index 36f24bff2ae0..67c2db5a3cb9 100644
--- a/toolkit/test/accessibility/AccessibilityTree.java
+++ b/toolkit/test/accessibility/AccessibilityTree.java
@@ -151,8 +151,6 @@ public class AccessibilityTree
// return first expanded object
TreePath aFirst = null;
- // System.out.print ("e");
-
try
{
// get 'our' object
diff --git a/toolkit/test/accessibility/CanvasShape.java b/toolkit/test/accessibility/CanvasShape.java
index 69e3dfba5bc1..cf0f49220203 100644
--- a/toolkit/test/accessibility/CanvasShape.java
+++ b/toolkit/test/accessibility/CanvasShape.java
@@ -32,7 +32,6 @@ class CanvasShape
public final Color maSelectionColor = Color.green;
public final Color maFocusColor = Color.blue;
- // public AccessibleObject (XAccessibleContext xContext, TreePath aPath)
public CanvasShape (AccTreeNode aNode)
{
maNode = aNode;
diff --git a/toolkit/test/accessibility/NodeHandler.java b/toolkit/test/accessibility/NodeHandler.java
index cad4952df567..e6da882ac075 100644
--- a/toolkit/test/accessibility/NodeHandler.java
+++ b/toolkit/test/accessibility/NodeHandler.java
@@ -47,11 +47,6 @@ abstract class NodeHandler
}
}
- /** This factory method creates an individual handler for the specified
- object that may hold information to accelerate the access to its children.
- */
- // public abstract NodeHandler createHandler (Object aObject);
-
/** return the number of children this object has */
public int getChildCount(Object aObject)
{
@@ -135,10 +130,6 @@ abstract class NodeHandler
return false;
}
- /** change this child's value */
- // public void setChild(Object aObject, int nIndex) { }
-
-
/** get names of supported actions */
public String[] getActions (AccessibleTreeNode aNode)
{
diff --git a/toolkit/test/accessibility/TextUpdateListener.java b/toolkit/test/accessibility/TextUpdateListener.java
index 4364d5598884..cd851140cbec 100644
--- a/toolkit/test/accessibility/TextUpdateListener.java
+++ b/toolkit/test/accessibility/TextUpdateListener.java
@@ -52,28 +52,6 @@ class TextUpdateListener implements TreeModelListener
// first child! Then we call updateText
updateText( xText, aNode.toString() );
}
- else
- {
- // JDK 1.4:
- // // check for pattern "Selection:"
- // Matcher m = Pattern.compile(
- // "selection: \\[(-?[0-9]+),(-?[0-9]+)\\] \".*" ).
- // matcher( aNode.toString() );
- // if( m.matches() )
- // {
- // try
- // {
- // // aha! Selection:
- // setSelection( xText,
- // Integer.parseInt(m.group(1)),
- // Integer.parseInt(m.group(2)) );
- // }
- // catch( NumberFormatException f )
- // {
- // // ignore
- // }
- // }
- }
}
}
}
@@ -165,22 +143,4 @@ class TextUpdateListener implements TreeModelListener
}
}
- // /** replace the given node with a new xText node */
- // void updateNode( XAccessibleText xText,
- // DefaultMutableTreeNode aNode )
- // {
- // // create a new node
- // DefaultMutableTreeNode aNew = newTextTreeNode( xText );
-
- // // get parent (must be DefaultMutableTreeNode)
- // DefaultMutableTreeNode aParent =
- // (DefaultMutableTreeNode)aNode.getParent();
- // if( aParent != null )
- // {
- // // remove old sub-tree, and insert new one
- // int nIndex = aParent.getIndex( aNode );
- // aParent.remove( nIndex );
- // aParent.insert( aNew, nIndex );
- // }
- // }
}
diff --git a/toolkit/test/accessibility/tools/NameProvider.java b/toolkit/test/accessibility/tools/NameProvider.java
index ccd735610001..09ae5ea3e420 100644
--- a/toolkit/test/accessibility/tools/NameProvider.java
+++ b/toolkit/test/accessibility/tools/NameProvider.java
@@ -100,7 +100,6 @@ public class NameProvider
maStateMap.put (new Integer (AccessibleStateType.ARMED), "ARMED");
maStateMap.put (new Integer (AccessibleStateType.BUSY), "BUSY");
maStateMap.put (new Integer (AccessibleStateType.CHECKED), "CHECKED");
- // maStateMap.put (new Integer (AccessibleStateType.COLLAPSED), "COLLAPSED");
maStateMap.put (new Integer (AccessibleStateType.DEFUNC), "DEFUNC");
maStateMap.put (new Integer (AccessibleStateType.EDITABLE), "EDITABLE");
maStateMap.put (new Integer (AccessibleStateType.ENABLED), "ENABLED");
@@ -127,7 +126,6 @@ public class NameProvider
maStateMap.put (new Integer (AccessibleStateType.VISIBLE), "VISIBLE");
maStateMap.put (new Integer (AccessibleStateType.MANAGES_DESCENDANTS),
"MANAGES_DESCENDANTS");
- // maStateMap.put (new Integer (AccessibleStateType.INCONSISTENT),"INCONSISTENT");
maEventMap.put (new Integer (0),