Merge branch 'lang' into next

diylc/diylc-library/src/org/diylc/components/boards/TriPadBoard.java

@@ -227,7 +227,7 @@ public class TriPadBoard extends AbstractBoard {
     }
   }
 
-  @EditableProperty(name = "Holes per strip")
+  @EditableProperty(name = "Holes Per Strip")
   public int getStripSpan() {
     return stripSpan;
   }

diylc/diylc-library/src/org/diylc/components/connectivity/Line.java

@@ -162,7 +162,7 @@ public class Line extends AbstractLeadedComponent<Void> {
     this.thickness = thickness;   
   }
   
-  @EditableProperty
+  @EditableProperty(name = "Arrow Size")
   public Size getArrowSize() {
     if (arrowSize == null)
       arrowSize = thickness = new Size(1d, SizeUnit.px); 

diylc/diylc-library/src/org/diylc/components/connectivity/TraceCut.java

@@ -59,8 +59,10 @@ public class TraceCut extends AbstractComponent<Void> {
   public static Color SELECTION_COLOR = Color.red;
   public static Size HOLE_SIZE = new Size(0.7d, SizeUnit.mm);
 
-  private Size size = SIZE;
-  private Color fillColor = FILL_COLOR;
+  private Size size = SIZE;
+  @SuppressWarnings("unused")
+  @Deprecated
+  private transient Color fillColor = FILL_COLOR;
   @Deprecated
   private Color borderColor = BORDER_COLOR;
   private Color boardColor = AbstractBoard.BOARD_COLOR;
@@ -179,15 +181,6 @@ public class TraceCut extends AbstractComponent<Void> {
     this.size = size;
   }
 
-  @EditableProperty(name = "Fill")
-  public Color getFillColor() {
-    return fillColor;
-  }
-
-  public void setFillColor(Color fillColor) {
-    this.fillColor = fillColor;
-  }
-
   @Deprecated
   public Color getBorderColor() {
     return borderColor;

diylc/diylc-library/src/org/diylc/components/connectivity/Turret.java

@@ -107,7 +107,7 @@ public class Turret extends AbstractComponent<String> {
     this.size = size;
   }
 
-  @EditableProperty(name = "Hole size")
+  @EditableProperty(name = "Hole Size")
   public Size getHoleSize() {
     return holeSize;
   }

diylc/diylc-library/src/org/diylc/components/misc/WrapLabel.java

@@ -193,7 +193,7 @@ public class WrapLabel extends AbstractComponent<String> {
     FontMetrics fontMetrics = g2d.getFontMetrics();
     Rectangle2D rect = fontMetrics.getStringBounds("Wrap", g2d);
 
-    int textHeight = (int) (rect.getHeight());
+//    int textHeight = (int) (rect.getHeight());
     int textWidth = (int) (rect.getWidth());
 
     int x = (width - textWidth) / 2 + 1;

diylc/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java

@@ -268,7 +268,7 @@ public class RadialElectrolytic extends AbstractRadialComponent<Capacitance> {
     this.height = height;
   }
 
-  @EditableProperty(name = "Invert polarity")
+  @EditableProperty(name = "Invert Polarity")
   public boolean getInvert() {
     return invert;
   }

diylc/diylc-library/src/org/diylc/components/passive/TantalumCapacitor.java

@@ -226,7 +226,7 @@ public class TantalumCapacitor extends AbstractRadialComponent<Capacitance> {
     this.height = height;
   }
 
-  @EditableProperty(name = "Invert polarity")
+  @EditableProperty(name = "Invert Polarity")
   public boolean getInvert() {
     return invert;
   }

diylc/diylc-library/src/org/diylc/components/semiconductors/AbstractTransistorPackage.java

@@ -88,6 +88,13 @@ public abstract class AbstractTransistorPackage extends AbstractTransparentCompo
           case 1: return 2;
           case 2: return 0;
         }
+      case JFET_GDS:
+      case MOSFET_GDS:
+        switch (index) {
+          case 0: return 1;
+          case 1: return 0;
+          case 2: return 2;
+        }
       case JFET_SGD:
       case MOSFET_SGD:
         return 2 - index;

diylc/diylc-library/src/org/diylc/components/semiconductors/DiodeGlass.java

@@ -156,7 +156,7 @@ public class DiodeGlass extends AbstractLeadedComponent<String> {
     this.markerColor = markerColor;
   }
 
-  @EditableProperty(name = "Inside color")
+  @EditableProperty(name = "Inside Color")
   public Color getInsideColor() {
     if (insideColor == null)
       insideColor = INSIDE_COLOR;

diylc/diylc-library/src/org/diylc/components/shapes/TapeMeasure.java

@@ -213,7 +213,7 @@ public class TapeMeasure extends AbstractLeadedComponent<String> {
     this.thickness = thickness;   
   }
   
-  @EditableProperty
+  @EditableProperty(name = "Arrow Size")
   public Size getArrowSize() {
     if (arrowSize == null)
       arrowSize = thickness = new Size(1d, SizeUnit.px);