summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java1
-rw-r--r--src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java28
2 files changed, 3 insertions, 26 deletions
diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java
index ea649f9..6004f59 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java
+++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java
@@ -22,7 +22,6 @@ import com.c2kernel.common.ObjectNotFoundException;
import com.c2kernel.gui.MainFrame;
import com.c2kernel.gui.graph.view.PropertyTable;
import com.c2kernel.gui.graph.view.PropertyTableModel;
-import com.c2kernel.gui.graph.view.SelectedVertexPanel;
import com.c2kernel.gui.tabs.EntityTabPane;
import com.c2kernel.lookup.EntityPath;
import com.c2kernel.lookup.InvalidEntityPathException;
diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java b/src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java
index 63c1d3d..506e17c 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java
+++ b/src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java
@@ -4,7 +4,6 @@ import java.awt.GridBagLayout;
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
-import java.io.StringWriter;
import java.net.URL;
import javax.swing.Box;
@@ -20,9 +19,6 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.xml.serialize.Method;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
import org.exolab.castor.xml.schema.ElementDecl;
import org.exolab.castor.xml.schema.Schema;
import org.exolab.castor.xml.schema.reader.SchemaReader;
@@ -37,6 +33,7 @@ import com.c2kernel.gui.tabs.outcome.InvalidSchemaException;
import com.c2kernel.gui.tabs.outcome.OutcomeException;
import com.c2kernel.gui.tabs.outcome.OutcomeHandler;
import com.c2kernel.gui.tabs.outcome.OutcomeNotInitialisedException;
+import com.c2kernel.persistency.outcome.Outcome;
import com.c2kernel.utils.FileStringUtility;
import com.c2kernel.utils.Logger;
@@ -251,7 +248,7 @@ public class OutcomePanel extends JPanel implements OutcomeHandler
textPanel.add(errorMsg);
textPanel.add(Box.createVerticalGlue());
if (outcomeDOM!=null) {
- basicView = new JTextArea(serialize(outcomeDOM, true));
+ basicView = new JTextArea(Outcome.serialize(outcomeDOM, true));
basicView.setEnabled(!readOnly);
textPanel.add(basicView);
}
@@ -326,7 +323,7 @@ public class OutcomePanel extends JPanel implements OutcomeHandler
if (useForm)
{
documentRoot.validateStructure();
- return serialize(outcomeDOM, false);
+ return Outcome.serialize(outcomeDOM, false);
}
else
{
@@ -334,25 +331,6 @@ public class OutcomePanel extends JPanel implements OutcomeHandler
}
}
- static public String serialize(Document doc, boolean prettyPrint)
- {
- String serializedDoc = null;
- OutputFormat format = new OutputFormat(Method.XML, null, prettyPrint);
- StringWriter stringOut = new StringWriter();
- XMLSerializer serial = new XMLSerializer(stringOut, format);
- try
- {
- serial.asDOMSerializer();
- serial.serialize(doc);
- }
- catch (java.io.IOException ex)
- {
- Logger.error(ex.toString());
- }
- serializedDoc = stringOut.toString();
- return serializedDoc;
- }
-
@Override
public boolean isUnsaved() {
return unsaved;