summaryrefslogtreecommitdiff
path: root/scripting/java/com/sun/star/script/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-08 11:36:04 +0200
committerNoel Grandin <noel@peralex.com>2014-08-13 08:49:22 +0200
commitda677dfd59c2b551f3335ee0a5d5dfb33f9869c5 (patch)
tree9aa09066c95935117bf405b119ed9f89f448a54d /scripting/java/com/sun/star/script/framework
parent14d1a11ec4a7ed0deeac522403248536e8d23f57 (diff)
java: reduce scope, make fields private
found by UCDetector Change-Id: I7f97e15667159cf8ee776e8f32fdcdec8ec00ed6
Diffstat (limited to 'scripting/java/com/sun/star/script/framework')
-rw-r--r--scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java8
-rw-r--r--scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java8
-rw-r--r--scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java10
-rw-r--r--scripting/java/com/sun/star/script/framework/container/Parcel.java4
-rw-r--r--scripting/java/com/sun/star/script/framework/container/ParcelContainer.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java4
-rw-r--r--scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/PathUtils.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/ScriptContext.java8
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java4
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java2
13 files changed, 29 insertions, 29 deletions
diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index 01eda4dcd276..75e4771ddf78 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
@@ -57,10 +57,10 @@ public class ParcelBrowseNode extends PropertySet
private Collection<XBrowseNode> browsenodes;
private ParcelContainer container;
private Parcel parcel;
- public boolean deletable = true;
- public boolean editable = false;
- public boolean creatable = false;
- public boolean renamable = true;
+ private boolean deletable = true;
+ private boolean editable = false;
+ private boolean creatable = false;
+ private boolean renamable = true;
public ParcelBrowseNode( ScriptProvider provider, ParcelContainer container, String parcelName ) {
this.provider = provider;
diff --git a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
index 3000ece25e64..3f0f7c2b4ce2 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
@@ -46,12 +46,12 @@ import javax.swing.JOptionPane;
public class ProviderBrowseNode extends PropertySet
implements XBrowseNode, XInvocation
{
- protected ScriptProvider provider;
- protected Collection<XBrowseNode> browsenodes;
- protected String name;
+ private ScriptProvider provider;
+ private Collection<XBrowseNode> browsenodes;
+ private String name;
protected ParcelContainer container;
protected Parcel parcel;
- protected XComponentContext m_xCtx;
+ private XComponentContext m_xCtx;
public boolean deletable = true;
public boolean creatable = true;
diff --git a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
index f59b9594c1a1..88557010d9bf 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
@@ -52,11 +52,11 @@ public class ScriptBrowseNode extends PropertySet
private Parcel parent;
private String name;
- public String uri;
- public String description;
- public boolean editable = false;
- public boolean deletable = false;
- public boolean renamable = false;
+ private String uri;
+ private String description;
+ private boolean editable = false;
+ private boolean deletable = false;
+ private boolean renamable = false;
public ScriptBrowseNode( ScriptProvider provider, Parcel parent,
String name )
diff --git a/scripting/java/com/sun/star/script/framework/container/Parcel.java b/scripting/java/com/sun/star/script/framework/container/Parcel.java
index 1b3da878752b..0a5b75a5c3f0 100644
--- a/scripting/java/com/sun/star/script/framework/container/Parcel.java
+++ b/scripting/java/com/sun/star/script/framework/container/Parcel.java
@@ -30,8 +30,8 @@ import java.io.*;
public class Parcel implements XNameContainer
{
- protected ParcelDescriptor m_descriptor;
- protected String name;
+ private ParcelDescriptor m_descriptor;
+ private String name;
protected ParcelContainer parent;
protected XSimpleFileAccess m_xSFA;
public Parcel( XSimpleFileAccess xSFA, ParcelContainer parent, ParcelDescriptor desc, String parcelName )
diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index 22a0b0059bfb..bb6c6fd39781 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -47,7 +47,7 @@ public class ParcelContainer implements XNameAccess
{
protected String language;
protected String containerUrl;
- protected Collection<Parcel> parcels = new ArrayList<Parcel>(10);
+ private Collection<Parcel> parcels = new ArrayList<Parcel>(10);
static protected XSimpleFileAccess m_xSFA;
protected XComponentContext m_xCtx;
private ParcelContainer parent = null;
diff --git a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
index 34fc62f5bbe0..bff215e08a1b 100644
--- a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
@@ -40,8 +40,8 @@ public class UnoPkgContainer extends ParcelContainer
{
private Map<String,ParcelContainer> registeredPackages = new HashMap<String,ParcelContainer>();
- protected String extensionDb;
- protected String extensionRepository;
+ private String extensionDb;
+ private String extensionRepository;
public UnoPkgContainer( XComponentContext xCtx, String locationURL,
String _extensionDb, String _extensionRepository, String language ) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.lang.WrappedTargetException
diff --git a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
index 2dd7381f2bb7..8c53edd39c74 100644
--- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
+++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
@@ -37,7 +37,7 @@ public class UCBStreamHandler extends URLStreamHandler {
private XSimpleFileAccess m_xSimpleFileAccess = null;
private HashMap<String,InputStream> m_jarStreamMap = new HashMap<String,InputStream>(12);
- public static String m_ucbscheme;
+ private static String m_ucbscheme;
public UCBStreamHandler( String scheme, XSimpleFileAccess xSFA )
{
diff --git a/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
index f5694477725e..b931aea238ea 100644
--- a/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
+++ b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
@@ -24,7 +24,7 @@ import java.io.IOException;
public class XInputStreamImpl implements XInputStream
{
- InputStream is;
+ private InputStream is;
public XInputStreamImpl( InputStream is )
{
this.is = is;
diff --git a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
index e3c561cff48d..d221155d3902 100644
--- a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
@@ -21,7 +21,7 @@ import com.sun.star.io.XOutputStream;
public class XOutputStreamWrapper extends OutputStream {
- XOutputStream m_xOutputStream;
+ private XOutputStream m_xOutputStream;
public XOutputStreamWrapper(XOutputStream xOs ) {
this.m_xOutputStream = xOs;
}
diff --git a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
index 5229b76cf1c3..63e8296e0b91 100644
--- a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
+++ b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
@@ -27,7 +27,7 @@ import com.sun.star.uno.IQueryInterface;
public class PathUtils {
- public static String FILE_URL_PREFIX;
+ private static String FILE_URL_PREFIX;
public static String BOOTSTRAP_NAME;
private static boolean m_windows = false;
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
index 6532c5f6a95a..0f21981b8678 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
@@ -40,12 +40,12 @@ public class ScriptContext extends PropertySet implements XScriptContext
private final static String DOC_URI = "SCRIPTING_DOC_URI";
- public XModel m_xModel = null;
- public XScriptInvocationContext m_xInvocationContext = null;
+ private XModel m_xModel = null;
+ private XScriptInvocationContext m_xInvocationContext = null;
public String m_sDocURI = null;
- public XDesktop m_xDeskTop = null;
+ private XDesktop m_xDeskTop = null;
public Integer m_iStorageID = null;
- public XComponentContext m_xComponentContext = null;
+ private XComponentContext m_xComponentContext = null;
private ScriptContext( XComponentContext xmComponentContext,
XDesktop xDesktop, XModel xModel, XScriptInvocationContext xInvocContext)
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index 9fb9f15f12aa..ad0c7b07fcad 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -92,10 +92,10 @@ public abstract class ScriptProvider
protected String language;
protected XComponentContext m_xContext;
- protected XMultiComponentFactory m_xMultiComponentFactory;
+ private XMultiComponentFactory m_xMultiComponentFactory;
protected XModel m_xModel;
protected XScriptInvocationContext m_xInvocContext;
- protected ParcelContainer m_container;
+ private ParcelContainer m_container;
// proxies to helper objects which implement interfaces
private XPropertySet m_xPropertySetProxy;
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index 130c44bb37ab..b18325d47d46 100644
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -325,7 +325,7 @@ public class ScriptEditorForJavaScript implements ScriptEditor
class closeHandler implements Runnable
{
- URL url;
+ private URL url;
private closeHandler( URL url )
{
this.url = url;