summaryrefslogtreecommitdiff
path: root/scripting
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-08 12:44:57 +0200
committerNoel Grandin <noel@peralex.com>2014-08-13 08:49:23 +0200
commit68cd011c907d00493bf2bfde531c1e244819596b (patch)
tree0225318c908b00faaa701a19aaf7aa567c3582a0 /scripting
parent70f56bc22fe952c75ec714e05e1bb5296491a36a (diff)
java: reduce scope, make some methods private
found by UCDetector Change-Id: Ib1425edde146193a65c242dc159b7e3fbf0e4a2e
Diffstat (limited to 'scripting')
-rw-r--r--scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java6
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java2
-rw-r--r--scripting/java/org/openoffice/idesupport/SVersionRCFile.java2
-rw-r--r--scripting/java/org/openoffice/idesupport/xml/Manifest.java2
-rw-r--r--scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java4
-rw-r--r--scripting/workben/ifc/scripting/ScriptingUtils.java4
-rw-r--r--scripting/workben/installer/InstUtil.java10
8 files changed, 16 insertions, 16 deletions
diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
index ba8ca3adfd9e..dd7017b32df1 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
@@ -75,7 +75,7 @@ public class ParcelDescriptor {
// returns the ParcelDescriptor in the corresponding directory
// returns null if no ParcelDescriptor is found in the directory
- public static synchronized ParcelDescriptor
+ private static synchronized ParcelDescriptor
getParcelDescriptor(File parent) {
File path = new File(parent, PARCEL_DESCRIPTOR_NAME);
@@ -166,7 +166,7 @@ public class ParcelDescriptor {
initLanguageProperties();
}
- public void write(File file) throws IOException {
+ private void write(File file) throws IOException {
FileOutputStream fos = new FileOutputStream(file);
XMLParserFactory.getParser().write(document, fos);
fos.close();
@@ -297,7 +297,7 @@ public class ParcelDescriptor {
addScriptEntry(scripts.next());
}
- public String getLanguageProperty(String name) {
+ private String getLanguageProperty(String name) {
return languagedepprops.get(name);
}
diff --git a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
index 8ec9b0a08fe8..823f2ff731e7 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
@@ -41,7 +41,7 @@ public class ClassLoaderFactory
}
return getURLClassLoader( parent, classPath );
}
- public static ClassLoader getURLClassLoader( ClassLoader parent, URL[] classpath)
+ private static ClassLoader getURLClassLoader( ClassLoader parent, URL[] classpath)
{
return new URLClassLoader( classpath, parent);
}
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index 04ca755a6a72..7c216e494fbb 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -122,7 +122,7 @@ public class PlainSourceView extends JScrollPane
/* If the number of lines in the JTextArea has changed then update the
GlyphGutter */
- public void doChanged() {
+ private void doChanged() {
isModified = true;
if (linecount != ta.getLineCount()) {
diff --git a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
index 01f2db7858fa..e4854d26f1bb 100644
--- a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
+++ b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
@@ -77,7 +77,7 @@ public class SVersionRCFile {
return(createInstance(DEFAULT_NAME));
}
- public static SVersionRCFile createInstance(String name) {
+ private static SVersionRCFile createInstance(String name) {
SVersionRCFile result = null;
synchronized(SVersionRCFile.class) {
diff --git a/scripting/java/org/openoffice/idesupport/xml/Manifest.java b/scripting/java/org/openoffice/idesupport/xml/Manifest.java
index b2bf6101f78e..581cadae51d6 100644
--- a/scripting/java/org/openoffice/idesupport/xml/Manifest.java
+++ b/scripting/java/org/openoffice/idesupport/xml/Manifest.java
@@ -118,7 +118,7 @@ public class Manifest {
return result;
}
- public void write(OutputStream out) throws IOException {
+ private void write(OutputStream out) throws IOException {
XMLParserFactory.getParser().write(document, out);
}
}
diff --git a/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java b/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
index 36380a2b6c06..bd5eb48c3f20 100644
--- a/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
+++ b/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
@@ -81,7 +81,7 @@ public class ParcelZipper
return zipParcel(basedir, targetfile, filter);
}
- public String zipParcel(File basedir, File targetfile, FileFilter filter)
+ private String zipParcel(File basedir, File targetfile, FileFilter filter)
throws IOException {
String realpath, tmppath;
@@ -557,7 +557,7 @@ public class ParcelZipper
return result;
}
- public String getParcelLanguage(File file) throws IOException {
+ private String getParcelLanguage(File file) throws IOException {
ZipFile zf = null;
ZipEntry ze = null;
InputStream is = null;
diff --git a/scripting/workben/ifc/scripting/ScriptingUtils.java b/scripting/workben/ifc/scripting/ScriptingUtils.java
index f10cf53f15b5..84cce3fc48c4 100644
--- a/scripting/workben/ifc/scripting/ScriptingUtils.java
+++ b/scripting/workben/ifc/scripting/ScriptingUtils.java
@@ -55,7 +55,7 @@ public class ScriptingUtils {
return storageManager.getScriptStorage(id);
}
- public int getStorageId(XMultiServiceFactory xMSF, String location) {
+ private int getStorageId(XMultiServiceFactory xMSF, String location) {
if (location.equals("share"))
return 0;
@@ -94,7 +94,7 @@ public class ScriptingUtils {
return id;
}
- public XSimpleFileAccess getXSimpleFileAccess(XMultiServiceFactory xMSF) {
+ private XSimpleFileAccess getXSimpleFileAccess(XMultiServiceFactory xMSF) {
XSimpleFileAccess access = null;
try {
diff --git a/scripting/workben/installer/InstUtil.java b/scripting/workben/installer/InstUtil.java
index dc4bb37646e4..ed9fd928e17b 100644
--- a/scripting/workben/installer/InstUtil.java
+++ b/scripting/workben/installer/InstUtil.java
@@ -150,7 +150,7 @@ public class InstUtil {
- public static Properties getJeditLocation() {
+ private static Properties getJeditLocation() {
Properties results = new Properties();
@@ -236,7 +236,7 @@ public class InstUtil {
- public static File findVersionFile(File start)
+ private static File findVersionFile(File start)
{
File versionFile = null;
@@ -261,7 +261,7 @@ public class InstUtil {
return versionFile;
}
- public static boolean verifySversionExists(File sversionFile) {
+ private static boolean verifySversionExists(File sversionFile) {
if (!sversionFile.exists())
return false;
return true;
@@ -329,11 +329,11 @@ public class InstUtil {
return results;
}
- public static String getJavaVersion() {
+ private static String getJavaVersion() {
return System.getProperty("java.version");
}
- public static boolean isCorrectJavaVersion() {
+ private static boolean isCorrectJavaVersion() {
if (System.getProperty("java.version").startsWith("1.4"))
return true;
return false;