Turn forwarding among ScriptEntry ctors around, dropping one

Change-Id: If3c86c7e5c4acaf4a3e48194e24c3c73e4e99499

1 files changed, 11 insertions, 19 deletions

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 46c4562d3675..377ca2dccfff 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
@@ -26,25 +26,11 @@ public class ScriptEntry implements Cloneable {
     private String language;
     private String languagename;
     private String location;
-    private String logicalname = "";
-    private String description = "";
+    private String logicalname;
+    private String description;
 
     private Map<String, String> languagedepprops;
 
-    private ScriptEntry(String language, String languagename,
-                       String location) {
-
-        this.language = language;
-        this.languagename = languagename;
-        // logical name/ function name concept
-        // needs to be reworked, in meantime
-        // function name ( from xml ) will be used
-        // as logical name also
-        this.logicalname = languagename;
-        this.location = location;
-        this.languagedepprops =  new HashMap<String, String>();
-    }
-
     protected ScriptEntry(ScriptEntry entry) {
         this.language = entry.language;
         this.languagename = entry.languagename;
@@ -56,14 +42,20 @@ public class ScriptEntry implements Cloneable {
 
     public ScriptEntry(String language, String languagename,
                        String location, Map<String, String> languagedepprops) {
-        this(language, languagename, location);
-        this.languagedepprops = languagedepprops;
+        this(language, languagename, location, languagedepprops, "");
     }
 
     public ScriptEntry(String language, String languagename,
                        String location, Map<String, String> languagedepprops,
                        String description) {
-        this(language, languagename, location);
+        this.language = language;
+        this.languagename = languagename;
+        // logical name/ function name concept
+        // needs to be reworked, in meantime
+        // function name ( from xml ) will be used
+        // as logical name also
+        this.logicalname = languagename;
+        this.location = location;
         this.languagedepprops = languagedepprops;
         this.description = description;
     }