From 8a4e256d67fae1751eda4f774cdee41ef632de04 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 4 Mar 2016 15:34:45 +0100 Subject: Scripting.location is unused Change-Id: Ia534b5aa579a678f8b0273e6c8c12a6ad335c67a --- .../star/script/framework/browse/ParcelBrowseNode.java | 2 +- .../star/script/framework/browse/ScriptBrowseNode.java | 2 +- .../script/framework/container/ParcelDescriptor.java | 2 +- .../star/script/framework/container/ScriptEntry.java | 17 ++++------------- 4 files changed, 7 insertions(+), 16 deletions(-) (limited to 'scripting/java') 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 8e9b3a0f368a..f1e5d0e52c06 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java @@ -207,7 +207,7 @@ public class ParcelBrowseNode extends PropertySet implements String language = container.getLanguage(); - ScriptEntry entry = new ScriptEntry(language, languageName, "", + ScriptEntry entry = new ScriptEntry(language, languageName, new HashMap()); Parcel parcel = (Parcel)container.getByName(getName()); 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 8c149183840b..627b6ed47109 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java @@ -247,7 +247,7 @@ public class ScriptBrowseNode extends PropertySet implements String language = provider.getName(); - ScriptEntry entry = new ScriptEntry(language, languageName, "", + ScriptEntry entry = new ScriptEntry(language, languageName, new HashMap()); ScriptMetaData data = 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 f58a9d88d838..a8b12e071284 100644 --- a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java +++ b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java @@ -196,7 +196,7 @@ public class ParcelDescriptor { } ScriptEntry entry = - new ScriptEntry(language, languagename, "", langProps, description); + new ScriptEntry(language, languagename, langProps, description); scripts.add(entry); } diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java index c49918fe0855..24718a705f88 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java @@ -25,7 +25,6 @@ public class ScriptEntry implements Cloneable { private final String language; private final String languagename; - private final String location; private final String logicalname; private final String description; @@ -35,18 +34,17 @@ public class ScriptEntry implements Cloneable { this.language = entry.language; this.languagename = entry.languagename; this.logicalname = entry.languagename; - this.location = entry.location; this.languagedepprops = entry.languagedepprops; this.description = entry.description; } public ScriptEntry(String language, String languagename, - String location, Map languagedepprops) { - this(language, languagename, location, languagedepprops, ""); + Map languagedepprops) { + this(language, languagename, languagedepprops, ""); } public ScriptEntry(String language, String languagename, - String location, Map languagedepprops, + Map languagedepprops, String description) { this.language = language; this.languagename = languagename; @@ -55,7 +53,6 @@ public class ScriptEntry implements Cloneable { // function name ( from xml ) will be used // as logical name also this.logicalname = languagename; - this.location = location; this.languagedepprops = languagedepprops; this.description = description; } @@ -69,8 +66,7 @@ public class ScriptEntry implements Cloneable { return language.equals(other.getLanguage()) && languagename.equals(other.getLanguageName()) && logicalname.equals(other.getLogicalName()) && - languagedepprops.equals(other.getLanguageProperties()) && - location.equals(other.getLocation()); + languagedepprops.equals(other.getLanguageProperties()); } @Override @@ -94,10 +90,6 @@ public class ScriptEntry implements Cloneable { return language; } - public String getLocation() { - return location; - } - public String getDescription() { return description; } @@ -106,7 +98,6 @@ public class ScriptEntry implements Cloneable { public String toString() { return "\nLogicalName = " + logicalname + "\nLanguageName = " + languagename + - "\nLocation = " + location + "\nLanguaguageProperties = " + languagedepprops; } } -- cgit