INTEGRATION: CWS dba204b (1.2.52); FILE MERGED

2006/07/13 07:12:16 fs 1.2.52.1: #i65159#

2 files changed, 24 insertions, 18 deletions

diff --git a/extensions/qa/integration/extensions/MethodHandler.java b/extensions/qa/integration/extensions/MethodHandler.java
index 25a5171bc2e5..6fb9dd5eb664 100644
--- a/extensions/qa/integration/extensions/MethodHandler.java
+++ b/extensions/qa/integration/extensions/MethodHandler.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: MethodHandler.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2006-03-31 12:17:41 $
+ *  last change: $Author: rt $ $Date: 2006-07-26 07:51:41 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -102,24 +102,27 @@ public class MethodHandler implements XPropertyHandler
         return _controlValue;
     }
 
-    public void describePropertyLine(String _propertyName, com.sun.star.inspection.LineDescriptor[] _lineDescriptor, com.sun.star.inspection.XPropertyControlFactory _propertyControlFactory) throws com.sun.star.beans.UnknownPropertyException, com.sun.star.lang.NullPointerException
+    public com.sun.star.inspection.LineDescriptor describePropertyLine(String _propertyName, com.sun.star.inspection.XPropertyControlFactory _propertyControlFactory) throws com.sun.star.beans.UnknownPropertyException, com.sun.star.lang.NullPointerException
     {
-        _lineDescriptor[0] = new LineDescriptor();
-        _lineDescriptor[0].Category = "Methods";
-        _lineDescriptor[0].DisplayName = "has method";
-        _lineDescriptor[0].HasPrimaryButton = _lineDescriptor[0].HasSecondaryButton = false;
-        _lineDescriptor[0].IndentLevel = 0;
+        com.sun.star.inspection.LineDescriptor descriptor = new com.sun.star.inspection.LineDescriptor();
+
+        descriptor = new LineDescriptor();
+        descriptor.Category = "Methods";
+        descriptor.DisplayName = "has method";
+        descriptor.HasPrimaryButton = descriptor.HasSecondaryButton = false;
+        descriptor.IndentLevel = 0;
         try
         {
             XPropertyControl control = (XPropertyControl)UnoRuntime.queryInterface(
                     XPropertyControl.class, _propertyControlFactory.createPropertyControl(
                     PropertyControlType.TextField, true ) );
 
-            _lineDescriptor[0].Control = control;
+            descriptor.Control = control;
         }
         catch( com.sun.star.lang.IllegalArgumentException e )
         {
         }
+        return descriptor;
     }
 
     public void dispose()
diff --git a/extensions/qa/integration/extensions/ServicesHandler.java b/extensions/qa/integration/extensions/ServicesHandler.java
index 4c469266486a..cc1c2a029fb5 100644
--- a/extensions/qa/integration/extensions/ServicesHandler.java
+++ b/extensions/qa/integration/extensions/ServicesHandler.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ServicesHandler.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2006-03-31 12:18:03 $
+ *  last change: $Author: rt $ $Date: 2006-07-26 07:51:53 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -136,24 +136,27 @@ public class ServicesHandler implements XPropertyHandler
         return _controlValue;
     }
 
-    public void describePropertyLine(String _propertyName, com.sun.star.inspection.LineDescriptor[] _lineDescriptor, com.sun.star.inspection.XPropertyControlFactory _propertyControlFactory) throws com.sun.star.beans.UnknownPropertyException, com.sun.star.lang.NullPointerException
+    public com.sun.star.inspection.LineDescriptor describePropertyLine(String _propertyName, com.sun.star.inspection.XPropertyControlFactory _propertyControlFactory) throws com.sun.star.beans.UnknownPropertyException, com.sun.star.lang.NullPointerException
     {
-        _lineDescriptor[0] = new LineDescriptor();
-        _lineDescriptor[0].Category = "Services";
-        _lineDescriptor[0].DisplayName = "supports service";
-        _lineDescriptor[0].HasPrimaryButton = _lineDescriptor[0].HasSecondaryButton = false;
-        _lineDescriptor[0].IndentLevel = 0;
+        com.sun.star.inspection.LineDescriptor descriptor = new com.sun.star.inspection.LineDescriptor();
+
+        descriptor = new LineDescriptor();
+        descriptor.Category = "Services";
+        descriptor.DisplayName = "supports service";
+        descriptor.HasPrimaryButton = descriptor.HasSecondaryButton = false;
+        descriptor.IndentLevel = 0;
         try
         {
             XHyperlinkControl hyperlinkControl = (XHyperlinkControl)UnoRuntime.queryInterface(
                     XHyperlinkControl.class, _propertyControlFactory.createPropertyControl( PropertyControlType.HyperlinkField, true ) );
             hyperlinkControl.addActionListener( new ClickHandler( m_context,  _propertyName ) );
 
-            _lineDescriptor[0].Control = hyperlinkControl;
+            descriptor.Control = hyperlinkControl;
         }
         catch( com.sun.star.lang.IllegalArgumentException e )
         {
         }
+        return descriptor;
     }
 
     public void dispose()