summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-12-17 11:35:04 +0200
committerNoel Grandin <noel@peralex.com>2014-12-19 10:41:58 +0200
commit2d82619a528ebdf867f242c85ad626462609ba39 (patch)
tree4653347d1e28bb02a723be5c58b744d277e6697f /framework
parent0ae24c2189ea68576c96fcbe87299b51256cb468 (diff)
java: static fields that should not be static
Found by FindBugs. Change-Id: I223841f7bb8c515c9612322abc0b13e134385abd
Diffstat (limited to 'framework')
-rw-r--r--framework/qa/complex/api_internal/CheckAPI.java2
-rw-r--r--framework/qa/complex/imageManager/CheckImageManager.java2
-rw-r--r--framework/qa/complex/imageManager/_XComponent.java6
-rw-r--r--framework/qa/complex/imageManager/_XInitialization.java4
-rw-r--r--framework/qa/complex/imageManager/_XTypeProvider.java7
-rw-r--r--framework/qa/complex/path_substitution/PathSubstitutionTest.java2
6 files changed, 11 insertions, 12 deletions
diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java
index e3ffa8bd584b..dfc77543bde7 100644
--- a/framework/qa/complex/api_internal/CheckAPI.java
+++ b/framework/qa/complex/api_internal/CheckAPI.java
@@ -50,7 +50,7 @@ public class CheckAPI {
/**
* The test parameters
*/
- private static TestParameters param = null;
+ private TestParameters param = null;
/**
*
diff --git a/framework/qa/complex/imageManager/CheckImageManager.java b/framework/qa/complex/imageManager/CheckImageManager.java
index 6495f7935d67..0efb6ed036f5 100644
--- a/framework/qa/complex/imageManager/CheckImageManager.java
+++ b/framework/qa/complex/imageManager/CheckImageManager.java
@@ -49,7 +49,7 @@ public class CheckImageManager {
/**
* The test parameters
*/
- private static TestParameters param = null;
+ private TestParameters param = null;
@Before public void before()
{
diff --git a/framework/qa/complex/imageManager/_XComponent.java b/framework/qa/complex/imageManager/_XComponent.java
index 8b7cdb5404e7..e5a3ea90e918 100644
--- a/framework/qa/complex/imageManager/_XComponent.java
+++ b/framework/qa/complex/imageManager/_XComponent.java
@@ -38,7 +38,7 @@ import lib.TestParameters;
*/
public class _XComponent {
- private static XComponent oObj = null;
+ private XComponent oObj = null;
private XComponent altDispose = null;
private final TestParameters tEnv;
private boolean listenerDisposed[] = new boolean[2];
@@ -66,7 +66,7 @@ public class _XComponent {
public _XComponent(TestParameters tEnv, XComponent oObj) {
this.tEnv = tEnv;
- _XComponent.oObj = oObj;
+ this.oObj = oObj;
}
/**
@@ -115,7 +115,7 @@ public class _XComponent {
return true;
} // finished _removeEventListener()
- private static boolean disposed = false;
+ private boolean disposed = false;
/**
* Disposes the object and then check appropriate listeners were
diff --git a/framework/qa/complex/imageManager/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java
index 14cab34d4ca0..5a5565786e73 100644
--- a/framework/qa/complex/imageManager/_XInitialization.java
+++ b/framework/qa/complex/imageManager/_XInitialization.java
@@ -41,12 +41,12 @@ public class _XInitialization {
private final TestParameters tEnv;
- private static XInitialization oObj = null;
+ private XInitialization oObj = null;
public _XInitialization(TestParameters tEnv, XInitialization oObj) {
this.tEnv = tEnv;
- _XInitialization.oObj = oObj;
+ this.oObj = oObj;
}
/**
diff --git a/framework/qa/complex/imageManager/_XTypeProvider.java b/framework/qa/complex/imageManager/_XTypeProvider.java
index 4af3a74a42a8..0e5e9e6bf92d 100644
--- a/framework/qa/complex/imageManager/_XTypeProvider.java
+++ b/framework/qa/complex/imageManager/_XTypeProvider.java
@@ -38,11 +38,10 @@ public class _XTypeProvider {
- private static XTypeProvider oObj = null;
- private static Type[] types = null;
+ private XTypeProvider oObj = null;
public _XTypeProvider(TestParameters tEnv, XTypeProvider oObj) {
- _XTypeProvider.oObj = oObj;
+ this.oObj = oObj;
}
/**
@@ -69,7 +68,7 @@ public class _XTypeProvider {
public boolean _getTypes() {
boolean result = false;
System.out.println("getting Types...");
- types = oObj.getTypes();
+ Type[] types = oObj.getTypes();
for (int i=0;i<types.length;i++) {
int k = i+1;
System.out.println(k+". Type is "+types[i].toString());
diff --git a/framework/qa/complex/path_substitution/PathSubstitutionTest.java b/framework/qa/complex/path_substitution/PathSubstitutionTest.java
index 152ee4d5b965..ff331392d5ba 100644
--- a/framework/qa/complex/path_substitution/PathSubstitutionTest.java
+++ b/framework/qa/complex/path_substitution/PathSubstitutionTest.java
@@ -38,7 +38,7 @@ import com.sun.star.util.XStringSubstitution;
public class PathSubstitutionTest
{
- private static XMultiServiceFactory xMSF;
+ private XMultiServiceFactory xMSF;
// all substitution variables
private VariableContainer substVars = null;