--- a/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java	Thu Jan 15 17:55:11 2015 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java	Sat Jan 17 04:58:03 2015 +0900
@@ -55,14 +55,14 @@
 
     public static void printUsage(String additional) {
         System.out
-        .println("Usage: java -jar (progfilename) [hostname [port_number]] [Options]?n"
-                + "    or?n"
-                + " java -jar (progfilename) [Options]?n"
-                + "    or?n java -jar (progfilename) -help?n    to view this help?n?n"
-                + "Where Options are:?n"
-                + additional
-                + "?nOptions format: -optionName=optionValue. Ex. -host=localhost -port=5900 -viewonly=yes?n"
-                + "Both option name and option value are case insensitive.");
+                .println("Usage: java -jar (progfilename) [hostname [port_number]] [Options]?n"
+                        + "    or?n"
+                        + " java -jar (progfilename) [Options]?n"
+                        + "    or?n java -jar (progfilename) -help?n    to view this help?n?n"
+                        + "Where Options are:?n"
+                        + additional
+                        + "?nOptions format: -optionName=optionValue. Ex. -host=localhost -port=5900 -viewonly=yes?n"
+                        + "Both option name and option value are case insensitive.");
     }
 
     public CuiViewer() {
@@ -76,7 +76,7 @@
         this();
         setLoggingLevel(parser.isSet(ParametersHandler.ARG_VERBOSE) ? Level.FINE
                 : parser.isSet(ParametersHandler.ARG_VERBOSE_MORE) ? Level.FINER
-                        : Level.INFO);
+                : Level.INFO);
 
         paramsMask = ParametersHandler.completeSettingsFromCLI(parser,
                 connectionParams, settings, uiSettings);
@@ -214,7 +214,7 @@
         viewer.cuiVersion = cui;
         TreeRFBProto rfb = new TreeRFBProto(false);
         CreateConnectionParam cp = new CreateConnectionParam(rfb);
-        if (hostName==null) {     
+        if (hostName==null) {
             try {
                 cp.findTreeVncRoot();
             } catch (InterruptedException e) {
@@ -289,37 +289,10 @@
 
     @Override
     public void setHeight(int h) {
-        height = h;        
-    }
-
-    @Override
-    public int getFixingWidth() {
-        return 0;
-    }
-
-    @Override
-    public int getFixingHeight() {
-        return 0;
+        height = h;
     }
 
     @Override
     public void setFixingSize(int width, int height) {
-
     }
-
-    @Override
-    public int getFrameWidth() {
-        return 0;
-    }
-
-    @Override
-    public int getFrameHeight() {
-        return 0;
-    }
-
-    @Override
-    public void setFrameSize(int width, int height) {
-
-    }
-
 }

--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Thu Jan 15 17:55:11 2015 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Sat Jan 17 04:58:03 2015 +0900
@@ -74,9 +74,6 @@
     public int height;
     public int fixingSizeWidth;
     public int fixingSizeHeight;
-    public int frameSizeWidth;
-    public int frameSizeHeight;
-
 
     public static void main(String[] args) {
         Parser parser = new Parser();
@@ -440,35 +437,8 @@
     }
 
     @Override
-    public int getFixingWidth() {
-        return fixingSizeWidth;
-    }
-
-    @Override
-    public int getFixingHeight() {
-        return fixingSizeHeight;
-    }
-
-    @Override
     public void setFixingSize(int width, int height) {
         this.fixingSizeWidth = width;
         this.fixingSizeHeight = height;
     }
-
-    @Override
-    public int getFrameWidth() {
-        return frameSizeWidth;
-    }
-
-    @Override
-    public int getFrameHeight() {
-        return frameSizeHeight;
-    }
-
-    @Override
-    public void setFrameSize(int width, int height) {
-        this.frameSizeWidth = width;
-        this.frameSizeHeight = height;
-    }
-
 }

--- a/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java	Thu Jan 15 17:55:11 2015 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java	Sat Jan 17 04:58:03 2015 +0900
@@ -43,16 +43,6 @@
 
     public void setHeight(int height);
 
-    public int getFixingWidth();
-
-    public int getFixingHeight();
-
     public void setFixingSize(int width, int height);
 
-    public int getFrameWidth();
-
-    public int getFrameHeight();
-
-    public void setFrameSize(int width, int height);
-
 }

--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Thu Jan 15 17:55:11 2015 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Sat Jan 17 04:58:03 2015 +0900
@@ -319,6 +319,8 @@
 					}
 				}
 			}
+            dim.width = workareaRectangle.width;
+            dim.height = workareaRectangle.height;
 			if ( ! location.equals(frame.getLocation())) {
 				frame.setLocation(location);
 			}
@@ -846,9 +848,6 @@
         	@Override
         	public void actionPerformed(ActionEvent e) {
 
-                Dimension size = frame.getSize();
-                viewer.setFrameSize(size.width, size.height);
-
                 ArrayList<Rectangle> rectangles = getScreenRectangles();
                 int leftScreenNumber = 0;
                 int rightScreenNumber = 1;