Index: core/windows/src/org/netbeans/core/windows/persistence/GroupParser.java
===================================================================
RCS file: /cvs/core/windows/src/org/netbeans/core/windows/persistence/GroupParser.java,v
retrieving revision 1.9
diff -u -r1.9 GroupParser.java
--- core/windows/src/org/netbeans/core/windows/persistence/GroupParser.java	25 Jun 2004 08:45:27 -0000	1.9
+++ core/windows/src/org/netbeans/core/windows/persistence/GroupParser.java	27 Jul 2004 11:52:28 -0000
@@ -47,8 +47,6 @@
     /** Local parent folder */
     private FileObject localParentFolder;
     
-    private PropertyHandler propertyHandler;
-    
     private InternalConfig internalConfig;
     
     private Map tcGroupParserMap = new HashMap(19);
@@ -87,9 +85,7 @@
     
     private void readProperties (GroupConfig sc) throws IOException {
         if (DEBUG) Debug.log(GroupParser.class, "readProperties ENTER" + " group:" + getName());
-        if (propertyHandler == null) {
-            propertyHandler = new PropertyHandler();
-        }
+        PropertyHandler propertyHandler = new PropertyHandler();
         InternalConfig internalCfg = getInternalConfig();
         internalCfg.clear();
         propertyHandler.readData(sc, internalCfg);
@@ -236,9 +232,7 @@
     
     private void writeProperties (GroupConfig sc) throws IOException {
         if (DEBUG) Debug.log(GroupParser.class, "writeProperties ENTER" + " group:" + getName());
-        if (propertyHandler == null) {
-            propertyHandler = new PropertyHandler();
-        }
+        PropertyHandler propertyHandler = new PropertyHandler();
         InternalConfig internalCfg = getInternalConfig();
         propertyHandler.writeData(sc, internalCfg);
         if (DEBUG) Debug.log(GroupParser.class, "writeProperties LEAVE" + " group:" + getName());
Index: core/windows/src/org/netbeans/core/windows/persistence/ModeParser.java
===================================================================
RCS file: /cvs/core/windows/src/org/netbeans/core/windows/persistence/ModeParser.java,v
retrieving revision 1.12
diff -u -r1.12 ModeParser.java
--- core/windows/src/org/netbeans/core/windows/persistence/ModeParser.java	12 Jul 2004 13:50:27 -0000	1.12
+++ core/windows/src/org/netbeans/core/windows/persistence/ModeParser.java	27 Jul 2004 11:52:28 -0000
@@ -67,8 +67,6 @@
     /** Local parent folder */
     private FileObject localParentFolder;
     
-    private PropertyHandler propertyHandler;
-    
     private InternalConfig internalConfig;
     
     /** Map of TCRefParser instances. Used for fast access. */
@@ -113,9 +111,7 @@
     
     private void readProperties (ModeConfig mc) throws IOException {
         if (DEBUG) Debug.log(ModeParser.class, "readProperties ENTER" + " mo:" + getName());
-        if (propertyHandler == null) {
-            propertyHandler = new PropertyHandler();
-        }
+        PropertyHandler propertyHandler = new PropertyHandler();
         InternalConfig internalCfg = getInternalConfig();
         internalCfg.clear();
         propertyHandler.readData(mc, internalCfg);
@@ -340,9 +336,7 @@
     
     private void writeProperties (ModeConfig mc) throws IOException {
         if (DEBUG) Debug.log(ModeParser.class, "writeProperties ENTER" + " mo:" + getName());
-        if (propertyHandler == null) {
-            propertyHandler = new PropertyHandler();
-        }
+        PropertyHandler propertyHandler = new PropertyHandler();
         InternalConfig internalCfg = getInternalConfig();
         propertyHandler.writeData(mc, internalCfg);
         if (DEBUG) Debug.log(ModeParser.class, "writeProperties LEAVE" + " mo:" + getName());
Index: core/windows/src/org/netbeans/core/windows/persistence/TCGroupParser.java
===================================================================
RCS file: /cvs/core/windows/src/org/netbeans/core/windows/persistence/TCGroupParser.java,v
retrieving revision 1.8
diff -u -r1.8 TCGroupParser.java
--- core/windows/src/org/netbeans/core/windows/persistence/TCGroupParser.java	22 Apr 2004 13:09:40 -0000	1.8
+++ core/windows/src/org/netbeans/core/windows/persistence/TCGroupParser.java	27 Jul 2004 11:52:28 -0000
@@ -48,8 +48,6 @@
     /** Local parent folder */
     private FileObject localParentFolder;
     
-    private PropertyHandler propertyHandler;
-    
     private InternalConfig internalConfig;
     
     /** true if wstcgrp file is present in module folder */
@@ -65,9 +63,7 @@
     TCGroupConfig load () throws IOException {
         if (DEBUG) Debug.log(TCGroupParser.class, "load ENTER" + " tcGrp:" + tc_id);
         TCGroupConfig tcGroupCfg = new TCGroupConfig();
-        if (propertyHandler == null) {
-            propertyHandler = new PropertyHandler();
-        }
+        PropertyHandler propertyHandler = new PropertyHandler();
         InternalConfig internalCfg = getInternalConfig();
         internalCfg.clear();
         propertyHandler.readData(tcGroupCfg, internalCfg);
@@ -78,9 +74,7 @@
     /** Save tcGroup configuration. */
     void save (TCGroupConfig tcGroupCfg) throws IOException {
         if (DEBUG) Debug.log(TCGroupParser.class, "save ENTER" + " tcGrp:" + tc_id);
-        if (propertyHandler == null) {
-            propertyHandler = new PropertyHandler();
-        }
+        PropertyHandler propertyHandler = new PropertyHandler();
         InternalConfig internalCfg = getInternalConfig();
         propertyHandler.writeData(tcGroupCfg, internalCfg);
         if (DEBUG) Debug.log(TCGroupParser.class, "save LEAVE" + " tcGrp:" + tc_id);
Index: core/windows/src/org/netbeans/core/windows/persistence/TCRefParser.java
===================================================================
RCS file: /cvs/core/windows/src/org/netbeans/core/windows/persistence/TCRefParser.java,v
retrieving revision 1.9
diff -u -r1.9 TCRefParser.java
--- core/windows/src/org/netbeans/core/windows/persistence/TCRefParser.java	20 May 2004 08:07:33 -0000	1.9
+++ core/windows/src/org/netbeans/core/windows/persistence/TCRefParser.java	27 Jul 2004 11:52:28 -0000
@@ -52,8 +52,6 @@
     /** Local parent folder */
     private FileObject localParentFolder;
     
-    private PropertyHandler propertyHandler;
-    
     private InternalConfig internalConfig;
     
     /** true if wstcref file is present in module folder */
@@ -69,9 +67,7 @@
     TCRefConfig load () throws IOException {
         if (DEBUG) Debug.log(TCRefParser.class, "load ENTER" + " tcRef:" + tc_id);
         TCRefConfig tcRefCfg = new TCRefConfig();
-        if (propertyHandler == null) {
-            propertyHandler = new PropertyHandler();
-        }
+        PropertyHandler propertyHandler = new PropertyHandler();
         InternalConfig internalCfg = getInternalConfig();
         internalCfg.clear();
         propertyHandler.readData(tcRefCfg, internalCfg);
@@ -82,9 +78,7 @@
     /** Save tcref configuration. */
     void save (TCRefConfig tcRefCfg) throws IOException {
         if (DEBUG) Debug.log(TCRefParser.class, "save ENTER" + " tcRef:" + tc_id);
-        if (propertyHandler == null) {
-            propertyHandler = new PropertyHandler();
-        }
+        PropertyHandler propertyHandler = new PropertyHandler(); // XXX cut off  writing from property handler
         InternalConfig internalCfg = getInternalConfig();
         propertyHandler.writeData(tcRefCfg, internalCfg);
         if (DEBUG) Debug.log(TCRefParser.class, "save LEAVE" + " tcRef:" + tc_id);
Index: core/windows/src/org/netbeans/core/windows/persistence/WindowManagerParser.java
===================================================================
RCS file: /cvs/core/windows/src/org/netbeans/core/windows/persistence/WindowManagerParser.java,v
retrieving revision 1.13
diff -u -r1.13 WindowManagerParser.java
--- core/windows/src/org/netbeans/core/windows/persistence/WindowManagerParser.java	16 Jun 2004 12:57:51 -0000	1.13
+++ core/windows/src/org/netbeans/core/windows/persistence/WindowManagerParser.java	27 Jul 2004 11:52:29 -0000
@@ -58,8 +58,6 @@
     
     private PersistenceManager pm;
     
-    private PropertyHandler propertyHandler;
-    
     private InternalConfig internalConfig;
     
     private Map modeParserMap = new HashMap(19);
@@ -322,9 +320,7 @@
     
     private void readProperties (WindowManagerConfig wmc) throws IOException {
         if (DEBUG) Debug.log(WindowManagerParser.class, "readProperties ENTER");
-        if (propertyHandler == null) {
-            propertyHandler = new PropertyHandler();
-        }
+        PropertyHandler propertyHandler = new PropertyHandler();
         internalConfig = new InternalConfig();
         propertyHandler.readData(wmc, internalConfig);
         if (DEBUG) Debug.log(WindowManagerParser.class, "readProperties LEAVE");
@@ -573,9 +569,7 @@
     
     private void writeProperties (WindowManagerConfig wmc) throws IOException {
         if (DEBUG) Debug.log(WindowManagerParser.class, "writeProperties ENTER");
-        if (propertyHandler == null) {
-            propertyHandler = new PropertyHandler();
-        }
+        PropertyHandler propertyHandler = new PropertyHandler();
         propertyHandler.writeData(wmc);
         if (DEBUG) Debug.log(WindowManagerParser.class, "writeProperties LEAVE");
     }