JAL-3032 adds Java 8 functionality (2/2)

[jalview.git] / src2 / net / miginfocom / layout / CC.java

diff --git a/src/net/miginfocom/layout/CC.java b/src2/net/miginfocom/layout/CC.java
similarity index 99%
rename from src/net/miginfocom/layout/CC.java
rename to src2/net/miginfocom/layout/CC.java
index e4cfff9..7206733 100644 (file)
--- a/src/net/miginfocom/layout/CC.java
+++ b/src2/net/miginfocom/layout/CC.java
@@ -1,5 +1,6 @@
 package net.miginfocom.layout;
 
+import java.io.*;
 import java.util.ArrayList;
 /*
  * License (BSD):
@@ -37,7 +38,7 @@ import java.util.ArrayList;
 
 /** A simple value holder for one component's constraint.
  */
-public final class CC// s implements Externalizable
+public final class CC implements Externalizable
 {
        private static final BoundSize DEF_GAP = BoundSize.NULL_SIZE;    // Only used to denote default wrap/newline gap.
 
@@ -1856,25 +1857,25 @@ public final class CC// s implements Externalizable
        }
 
 
-//     // ************************************************
-//     // Persistence Delegate and Serializable combined.
-//     // ************************************************
-//
-//     private Object readResolve() throws ObjectStreamException
-//     {
-//             return LayoutUtil.getSerializedObject(this);
-//     }
-//
-//     @Override
-//     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
-//     {
-//             LayoutUtil.setSerializedObject(this, LayoutUtil.readAsXML(in));
-//     }
-//
-//     @Override
-//     public void writeExternal(ObjectOutput out) throws IOException
-//     {
-//             if (getClass() == CC.class)
-//                     LayoutUtil.writeAsXML(out, this);
-//     }
+       // ************************************************
+       // Persistence Delegate and Serializable combined.
+       // ************************************************
+
+       private Object readResolve() throws ObjectStreamException
+       {
+               return LayoutUtil.getSerializedObject(this);
+       }
+
+       @Override
+       public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+       {
+               LayoutUtil.setSerializedObject(this, LayoutUtil.readAsXML(in));
+       }
+
+       @Override
+       public void writeExternal(ObjectOutput out) throws IOException
+       {
+               if (getClass() == CC.class)
+                       LayoutUtil.writeAsXML(out, this);
+       }
 }
\ No newline at end of file