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

[jalview.git] / src2 / net / miginfocom / swing / MigLayout.java

diff --git a/src/net/miginfocom/swing/MigLayout.java b/src2/net/miginfocom/swing/MigLayout.java
similarity index 93%
rename from src/net/miginfocom/swing/MigLayout.java
rename to src2/net/miginfocom/swing/MigLayout.java
index 8469d7c..fdd7718 100644 (file)
--- a/src/net/miginfocom/swing/MigLayout.java
+++ b/src2/net/miginfocom/swing/MigLayout.java
@@ -33,51 +33,21 @@ package net.miginfocom.swing;
  *         Date: 2006-sep-08
  */
 
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Insets;
-import java.awt.LayoutManager;
-import java.awt.LayoutManager2;
-import java.awt.Point;
-import java.awt.Window;
+import net.miginfocom.layout.*;
+
+import javax.swing.*;
+import javax.swing.Timer;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.swing.BoxLayout;
-import javax.swing.JComponent;
-import javax.swing.JEditorPane;
-import javax.swing.JPopupMenu;
-import javax.swing.JTextArea;
-import javax.swing.OverlayLayout;
-import javax.swing.SwingUtilities;
-import javax.swing.Timer;
-
-import net.miginfocom.layout.AC;
-import net.miginfocom.layout.BoundSize;
-import net.miginfocom.layout.CC;
-import net.miginfocom.layout.ComponentWrapper;
-import net.miginfocom.layout.ConstraintParser;
-import net.miginfocom.layout.ContainerWrapper;
-import net.miginfocom.layout.Grid;
-import net.miginfocom.layout.LC;
-import net.miginfocom.layout.LayoutCallback;
-import net.miginfocom.layout.LayoutUtil;
-import net.miginfocom.layout.PlatformDefaults;
-import net.miginfocom.layout.UnitValue;
+import java.io.*;
+import java.util.*;
 
 /** A very flexible layout manager.
  * <p>
  * Read the documentation that came with this layout manager for information on usage.
  */
-public class MigLayout implements LayoutManager2//, Externalizable
+public class MigLayout implements LayoutManager2, Externalizable
 {
        // ******** Instance part ********
 
@@ -775,27 +745,27 @@ public class MigLayout implements LayoutManager2//, Externalizable
                dirty = true;
        }
 
-//     // ************************************************
-//     // 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() == MigLayout.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() == MigLayout.class)
+                       LayoutUtil.writeAsXML(out, this);
+       }
 
        private class MyDebugRepaintListener implements ActionListener
        {