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

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

diff --git a/src/net/miginfocom/layout/AC.java b/src2/net/miginfocom/layout/AC.java
similarity index 96%
rename from src/net/miginfocom/layout/AC.java
rename to src2/net/miginfocom/layout/AC.java
index 231b333..2d1032c 100644 (file)
--- a/src/net/miginfocom/layout/AC.java
+++ b/src2/net/miginfocom/layout/AC.java
@@ -1,10 +1,6 @@
 package net.miginfocom.layout;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
+import java.io.*;
 import java.util.ArrayList;
 
 /*
@@ -50,7 +46,7 @@ import java.util.ArrayList;
  * Note that there are two way to build this constraint. Through String (e.g. <code>"[100]3[200,fill]"</code> or through API (E.g.
  * <code>new AC().size("100").gap("3").size("200").fill()</code>.
  */
-public final class AC //implements Externalizable
+public final class AC implements Externalizable
 {
        private final ArrayList<DimConstraint> cList = new ArrayList<DimConstraint>(1);
 
@@ -547,25 +543,25 @@ public final class AC //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() == AC.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() == AC.class)
+                       LayoutUtil.writeAsXML(out, this);
+       }
 }
\ No newline at end of file