浏览代码

spotbugs found something

Eren Yilmaz 6 年之前
父节点
当前提交
f05bfc924e
共有 2 个文件被更改,包括 14 次插入8 次删除
  1. 1 1
      src/view/MainView.java
  2. 13 7
      src/view/NodeView.java

+ 1 - 1
src/view/MainView.java

@@ -140,7 +140,7 @@ public class MainView {
         debugFrame.add( view );
         debugFrame.setSize( frame.getWidth(), frame.getHeight() );
         debugFrame.setVisible( true );
-        if (infoS.trim() != "") {
+        if (infoS.trim().equals("")) {
             System.out.println( "" );
             System.out.println( "Debug info:" );
             System.out.println( infoS );

+ 13 - 7
src/view/NodeView.java

@@ -45,18 +45,22 @@ public class NodeView extends JPanel {
     
     public int getScaledX( int x )
     {
-        double scale = Math.min( (double)super.getWidth() / (int)model.getWidth( layout ), (double)super.getHeight() / (int)model.getHeight( layout ));
+        double width_scale = super.getWidth() / model.getWidth( layout );
+        double height_scale = super.getHeight() / model.getHeight( layout );
+        double scale = Math.min( width_scale, height_scale);
         x *= scale;
-        if( scale == (double)super.getHeight() / (int)model.getHeight( layout ) )
+        if( scale < width_scale )
             x += (super.getWidth() - (model.getWidth( layout ) * scale )) / 2;
         return x;
     }
     
     public int getScaledY( int y )
     {
-        double scale = Math.min( (double)super.getWidth() / (int)model.getWidth( layout ), (double)super.getHeight() / (int)model.getHeight( layout ));
+        double width_scale = super.getWidth() / model.getWidth( layout );
+        double height_scale = super.getHeight() / model.getHeight( layout );
+        double scale = Math.min( width_scale, height_scale);
         y *= scale;
-        if( scale == (double)super.getWidth() / (int)model.getWidth( layout ) )
+        if( scale < height_scale )
             y += (super.getHeight() - (model.getHeight( layout ) * scale )) / 2;
         return y;
     }
@@ -66,15 +70,17 @@ public class NodeView extends JPanel {
     {
         if( layout == LayoutType.COMBINED && model.getColor( layout ) == null )
             return;
-        double scale = Math.min( (double)super.getWidth() / (int)model.getWidth( layout ), (double)super.getHeight() / (int)model.getHeight( layout ));
+        double width_scale = super.getWidth() / model.getWidth( layout );
+        double height_scale = super.getHeight() / model.getHeight( layout );
+        double scale = Math.min( width_scale, height_scale);
         ((Graphics2D)g).scale( scale, scale );
         int x = 0;
         int y = 0;
         int width = (int)(super.getWidth() / scale);
         int height = (int)(super.getHeight() / scale);
-        if( scale == (double)super.getWidth() / (int)model.getWidth( layout ) )
+        if( scale < height_scale )
         	y += (super.getHeight() - (model.getHeight( layout ) * scale )) / scale / 2;
-        if( scale == (double)super.getHeight() / (int)model.getHeight( layout ) )
+        if( scale < width_scale )
         	x += (super.getWidth() - (model.getWidth( layout ) * scale )) / scale / 2;
         if( model.isDummyNode() )
         {