Ability to rotate (almost) all components using keyboard shortcuts and 'Transform Selection' menu

diylc/diylc-core/src/org/diylc/common/DefaultComponentTransformer.java

@@ -0,0 +1,116 @@
+package org.diylc.common;
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+import org.apache.log4j.Logger;
+import org.diylc.core.Angle;
+import org.diylc.core.IDIYComponent;
+import org.diylc.presenter.ComponentProcessor;
+
+public class DefaultComponentTransformer implements IComponentTransformer {
+
+  private static final Logger LOG = Logger.getLogger(DefaultComponentTransformer.class);
+
+  @Override
+  public boolean canRotate(IDIYComponent<?> component) {
+    List<PropertyWrapper> properties =
+        ComponentProcessor.getInstance().extractProperties(component.getClass());
+
+    for (PropertyWrapper property : properties) {
+      if (property.getType().isAssignableFrom(Orientation.class)
+          || property.getType().isAssignableFrom(OrientationHV.class)
+          || property.getType().isAssignableFrom(Angle.class))
+        return true;
+    }
+    return false;
+  }
+
+  @Override
+  public boolean canMirror(IDIYComponent<?> component) {
+    return false;
+  }
+
+  @Override
+  public boolean mirroringChangesCircuit() {
+    return false;
+  }
+
+  @Override
+  public void rotate(IDIYComponent<?> component, Point2D center, int direction) {
+    boolean canRotate = false;
+    List<PropertyWrapper> properties =
+        ComponentProcessor.getInstance().extractProperties(component.getClass());
+
+    for (PropertyWrapper property : properties) {
+      try {
+        property.readFrom(component);
+      } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException
+          | SecurityException | NoSuchMethodException e) {
+        LOG.warn("Error while rotating component " + component.getName(), e);
+      }
+
+      try {
+        if (property.getType().isAssignableFrom(Orientation.class)) {
+          canRotate = true;
+          
+          Orientation o = (Orientation) property.getValue();
+          int oValue = o.ordinal();
+          oValue += direction;
+          if (oValue < 0)
+            oValue = Orientation.values().length - 1;
+          if (oValue >= Orientation.values().length)
+            oValue = 0;
+          o = Orientation.values()[oValue];
+          property.setValue(o);
+        }
+
+        if (property.getType().isAssignableFrom(OrientationHV.class)) {
+          canRotate = true;
+          
+          OrientationHV o = (OrientationHV) property.getValue();
+          int oValue = o.ordinal();
+          oValue += direction;
+          if (oValue < 0)
+            oValue = OrientationHV.values().length - 1;
+          if (oValue >= OrientationHV.values().length)
+            oValue = 0;
+          o = OrientationHV.values()[oValue];
+          property.setValue(o);
+        }
+
+        if (property.getType().isAssignableFrom(Angle.class)) {
+          canRotate = true;
+
+          Angle angle = (Angle) property.getValue();
+          Angle newAngle = angle.rotate(direction);
+          property.setValue(newAngle);
+        }
+      } catch (Exception e) {
+        LOG.warn("Error while rotating component " + component.getName(), e);
+      }
+
+      if (canRotate) {
+        AffineTransform rotate = AffineTransform.getRotateInstance(Math.PI / 2 * direction,
+            center.getX(), center.getY());
+        for (int index = 0; index < component.getControlPointCount(); index++) {
+          Point2D p = new Point2D.Double();
+          rotate.transform(component.getControlPoint(index), p);
+          component.setControlPoint(p, index);
+        }
+
+        try {
+          property.writeTo(component);
+        } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException
+            | SecurityException | NoSuchMethodException e) {
+          LOG.warn("Error while rotating component " + component.getName(), e);
+        }
+        break;
+      }
+    }
+  }
+
+  @Override
+  public void mirror(IDIYComponent<?> component, Point2D center, int direction) {}
+}

diylc/diylc-core/src/org/diylc/common/DefaultTransformer.java

@@ -1,52 +0,0 @@
-/*
-
-    DIY Layout Creator (DIYLC).
-    Copyright (c) 2009-2018 held jointly by the individual authors.
-
-    This file is part of DIYLC.
-
-    DIYLC is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    DIYLC is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-package org.diylc.common;
-
-import java.awt.geom.Point2D;
-import org.diylc.core.IDIYComponent;
-
-public class DefaultTransformer implements IComponentTransformer {
-
-  @Override
-  public boolean canRotate(IDIYComponent<?> component) {
-    return false;
-  }
-
-  @Override
-  public boolean canMirror(IDIYComponent<?> component) {
-    return false;
-  }
-  
-  @Override
-  public boolean mirroringChangesCircuit() {   
-    return false;
-  }
-
-  @Override
-  public void rotate(IDIYComponent<?> component, Point2D center, int direction) {
-  }
-
-  @Override
-  public void mirror(IDIYComponent<?> component, Point2D center, int direction) {
-  }
-
-}

diylc/diylc-core/src/org/diylc/core/annotations/ComponentDescriptor.java

@@ -23,7 +23,7 @@ package org.diylc.core.annotations;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import org.diylc.common.DefaultTransformer;
+import org.diylc.common.DefaultComponentTransformer;
 import org.diylc.common.IComponentTransformer;
 import org.diylc.core.CreationMethod;
 import org.diylc.core.IDIYComponent;
@@ -94,7 +94,7 @@ public @interface ComponentDescriptor {
   /**
    * @return if the component can be rotated and/or mirrored, returns a class of the transformer that can do it
    */
-  Class<? extends IComponentTransformer> transformer() default DefaultTransformer.class;
+  Class<? extends IComponentTransformer> transformer() default DefaultComponentTransformer.class;
 
   /**
    * Defines if and how a component should appear in auto-generated project keywords. See

diylc/diylc-core/src/org/diylc/presenter/update.xml

@@ -4349,5 +4349,25 @@
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>
+		<org.diylc.appframework.update.Version>
+			<versionNumber>
+				<major>4</major>
+				<minor>37</minor>
+				<build>0</build>
+			</versionNumber>
+			<releaseDate>2023-03-30 00:00:00.000 CET</releaseDate>
+			<name></name>
+			<changes>	
+				<org.diylc.appframework.update.Change>
+					<changeType>NEW_FEATURE</changeType>
+					<description>'Proto Board 780 Holes' added with two variations (sponsored by Pete Olivier)</description>
+				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Ability to rotate (almost) all components using keyboard shortcuts and 'Transform Selection' menu</description>
+				</org.diylc.appframework.update.Change>					
+			</changes>
+			<url>https://github.com/bancika/diy-layout-creator/releases</url>
+		</org.diylc.appframework.update.Version>
 	</a>
 </java.util.Arrays_-ArrayList>

diylc/diylc-library/src/org/diylc/components/electromechanical/DIPSwitch.java

@@ -1,23 +1,20 @@
 /*
-
+ * 
-    DIY Layout Creator (DIYLC).
+ * DIY Layout Creator (DIYLC). Copyright (c) 2009-2018 held jointly by the individual authors.
-    Copyright (c) 2009-2018 held jointly by the individual authors.
+ * 
-
+ * This file is part of DIYLC.
-    This file is part of DIYLC.
+ * 
-
+ * DIYLC is free software: you can redistribute it and/or modify it under the terms of the GNU
-    DIYLC is free software: you can redistribute it and/or modify
+ * General Public License as published by the Free Software Foundation, either version 3 of the
-    it under the terms of the GNU General Public License as published by
+ * License, or (at your option) any later version.
-    the Free Software Foundation, either version 3 of the License, or
+ * 
-    (at your option) any later version.
+ * DIYLC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-    DIYLC is distributed in the hope that it will be useful,
+ * Public License for more details.
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * You should have received a copy of the GNU General Public License along with DIYLC. If not, see
-    GNU General Public License for more details.
+ * <http://www.gnu.org/licenses/>.
-
+ * 
-    You should have received a copy of the GNU General Public License
-    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
-
  */
 package org.diylc.components.electromechanical;
 
@@ -38,7 +35,6 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
 import org.diylc.common.Orientation;
 import org.diylc.components.AbstractTransparentComponent;
-import org.diylc.components.transform.DIL_ICTransformer;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
@@ -54,10 +50,10 @@ import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;
 
-@ComponentDescriptor(name = "DIP Switch", author = "Branislav Stojkovic", category = "Electro-Mechanical",
+@ComponentDescriptor(name = "DIP Switch", author = "Branislav Stojkovic",
-    instanceNamePrefix = "SW", description = "Dual-in-line package switch",
+    category = "Electro-Mechanical", instanceNamePrefix = "SW",
-    zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE, transformer = DIL_ICTransformer.class,
+    description = "Dual-in-line package switch", zOrder = IDIYComponent.COMPONENT,
-    enableCache = true)
+    keywordPolicy = KeywordPolicy.SHOW_VALUE, enableCache = true)
 public class DIPSwitch extends AbstractTransparentComponent<String> implements ISwitch {
 
   private static final long serialVersionUID = 1L;
@@ -239,7 +235,8 @@ public class DIPSwitch extends AbstractTransparentComponent<String> implements I
           throw new RuntimeException("Unexpected orientation: " + orientation);
       }
       controlPoints[i] = new Point2D.Double(firstPoint.getX() + dx1, firstPoint.getY() + dy1);
-      controlPoints[i + switchCount.getValue()] = new Point2D.Double(firstPoint.getX() + dx2, firstPoint.getY() + dy2);
+      controlPoints[i + switchCount.getValue()] =
+          new Point2D.Double(firstPoint.getX() + dx2, firstPoint.getY() + dy2);
     }
   }
 
@@ -264,8 +261,12 @@ public class DIPSwitch extends AbstractTransparentComponent<String> implements I
           x -= (bodyWidth - rowSpacing) / 2;
           y -= pinSpacing / 2;
           for (int i = 0; i < getSwitchCount().getValue(); i++) {
-            tickHoleArea.add(new Area(new Rectangle2D.Double(controlPoints[i].getX() + (rowSpacing - tickHoleLength) / 2, controlPoints[i].getY() - tickSize / 2, tickHoleLength, tickSize)));
+            tickHoleArea.add(new Area(
-            tickArea.add(new Area(new Rectangle2D.Double(controlPoints[i].getX() + (rowSpacing - tickHoleLength) / 2, controlPoints[i].getY() - tickSize / 2, tickSize, tickSize)));
+                new Rectangle2D.Double(controlPoints[i].getX() + (rowSpacing - tickHoleLength) / 2,
+                    controlPoints[i].getY() - tickSize / 2, tickHoleLength, tickSize)));
+            tickArea.add(new Area(
+                new Rectangle2D.Double(controlPoints[i].getX() + (rowSpacing - tickHoleLength) / 2,
+                    controlPoints[i].getY() - tickSize / 2, tickSize, tickSize)));
           }
           break;
         case _90:
@@ -274,8 +275,11 @@ public class DIPSwitch extends AbstractTransparentComponent<String> implements I
           x -= (pinSpacing / 2) + width - pinSpacing;
           y -= (bodyWidth - rowSpacing) / 2;
           for (int i = 0; i < getSwitchCount().getValue(); i++) {
-            tickHoleArea.add(new Area(new Rectangle2D.Double(controlPoints[i].getX() - tickSize / 2, controlPoints[i].getY() + (rowSpacing - tickHoleLength) / 2, tickSize, tickHoleLength)));
+            tickHoleArea.add(new Area(new Rectangle2D.Double(controlPoints[i].getX() - tickSize / 2,
-            tickArea.add(new Area(new Rectangle2D.Double(controlPoints[i].getX() - tickSize / 2, controlPoints[i].getY() + (rowSpacing - tickHoleLength) / 2, tickSize, tickSize)));
+                controlPoints[i].getY() + (rowSpacing - tickHoleLength) / 2, tickSize,
+                tickHoleLength)));
+            tickArea.add(new Area(new Rectangle2D.Double(controlPoints[i].getX() - tickSize / 2,
+                controlPoints[i].getY() + (rowSpacing - tickHoleLength) / 2, tickSize, tickSize)));
           }
           break;
         case _180:
@@ -284,8 +288,12 @@ public class DIPSwitch extends AbstractTransparentComponent<String> implements I
           x -= rowSpacing + (bodyWidth - rowSpacing) / 2;
           y -= (pinSpacing / 2) + height - pinSpacing;
           for (int i = getSwitchCount().getValue(); i < controlPoints.length; i++) {
-            tickHoleArea.add(new Area(new Rectangle2D.Double(controlPoints[i].getX() + (rowSpacing - tickHoleLength) / 2, controlPoints[i].getY() - tickSize / 2, tickHoleLength, tickSize)));
+            tickHoleArea.add(new Area(
-            tickArea.add(new Area(new Rectangle2D.Double(controlPoints[i].getX() + (rowSpacing + tickHoleLength) / 2 - tickSize, controlPoints[i].getY() - tickSize / 2, tickSize, tickSize)));
+                new Rectangle2D.Double(controlPoints[i].getX() + (rowSpacing - tickHoleLength) / 2,
+                    controlPoints[i].getY() - tickSize / 2, tickHoleLength, tickSize)));
+            tickArea.add(new Area(new Rectangle2D.Double(
+                controlPoints[i].getX() + (rowSpacing + tickHoleLength) / 2 - tickSize,
+                controlPoints[i].getY() - tickSize / 2, tickSize, tickSize)));
           }
           break;
         case _270:
@@ -294,14 +302,20 @@ public class DIPSwitch extends AbstractTransparentComponent<String> implements I
           x -= pinSpacing / 2;
           y -= rowSpacing + (bodyWidth - rowSpacing) / 2;
           for (int i = getSwitchCount().getValue(); i < controlPoints.length; i++) {
-            tickHoleArea.add(new Area(new Rectangle2D.Double(controlPoints[i].getX() - tickSize / 2, controlPoints[i].getY() + (rowSpacing - tickHoleLength) / 2, tickSize, tickHoleLength)));
+            tickHoleArea.add(new Area(new Rectangle2D.Double(controlPoints[i].getX() - tickSize / 2,
-            tickArea.add(new Area(new Rectangle2D.Double(controlPoints[i].getX() - tickSize / 2, controlPoints[i].getY() + (rowSpacing - tickHoleLength) / 2 + tickHoleLength - tickSize, tickSize, tickSize)));
+                controlPoints[i].getY() + (rowSpacing - tickHoleLength) / 2, tickSize,
+                tickHoleLength)));
+            tickArea.add(new Area(new Rectangle2D.Double(
+                controlPoints[i].getX() - tickSize / 2, controlPoints[i].getY()
+                    + (rowSpacing - tickHoleLength) / 2 + tickHoleLength - tickSize,
+                tickSize, tickSize)));
           }
           break;
         default:
           throw new RuntimeException("Unexpected orientation: " + orientation);
       }
-      body[0] = new Area(new RoundRectangle2D.Double(x, y, width, height, EDGE_RADIUS, EDGE_RADIUS));
+      body[0] =
+          new Area(new RoundRectangle2D.Double(x, y, width, height, EDGE_RADIUS, EDGE_RADIUS));
       body[1] = tickHoleArea;
       body[2] = tickArea;
     }
@@ -309,8 +323,8 @@ public class DIPSwitch extends AbstractTransparentComponent<String> implements I
   }
 
   @Override
-  public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
+  public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
-      IDrawingObserver drawingObserver) {
+      Project project, IDrawingObserver drawingObserver) {
     if (checkPointsClipped(g2d.getClip())) {
       return;
     }
@@ -320,11 +334,17 @@ public class DIPSwitch extends AbstractTransparentComponent<String> implements I
       int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2;
       for (Point2D point : controlPoints) {
         g2d.setColor(PIN_COLOR);
-        int pinWidth = getClosestOdd(pinSize / (getOrientation() == Orientation.DEFAULT || getOrientation() == Orientation._180 ? 2f : 1f));
+        int pinWidth = getClosestOdd(pinSize
-        int pinHeight = getClosestOdd(pinSize / (getOrientation() == Orientation.DEFAULT || getOrientation() == Orientation._180 ? 1f : 2f));
+            / (getOrientation() == Orientation.DEFAULT || getOrientation() == Orientation._180 ? 2f
-        g2d.fillRect((int)(point.getX() - pinWidth / 2), (int)(point.getY() - pinHeight / 2), pinWidth, pinHeight);
+                : 1f));
+        int pinHeight = getClosestOdd(pinSize
+            / (getOrientation() == Orientation.DEFAULT || getOrientation() == Orientation._180 ? 1f
+                : 2f));
+        g2d.fillRect((int) (point.getX() - pinWidth / 2), (int) (point.getY() - pinHeight / 2),
+            pinWidth, pinHeight);
         g2d.setColor(PIN_BORDER_COLOR);
-        g2d.drawRect((int)(point.getX() - pinWidth / 2), (int)(point.getY() - pinHeight / 2), pinWidth, pinHeight);
+        g2d.drawRect((int) (point.getX() - pinWidth / 2), (int) (point.getY() - pinHeight / 2),
+            pinWidth, pinHeight);
       }
     }
     Composite oldComposite = g2d.getComposite();
@@ -337,14 +357,16 @@ public class DIPSwitch extends AbstractTransparentComponent<String> implements I
 
     Color finalBorderColor;
     if (outlineMode) {
-      Theme theme =
+      Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY,
-          (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+          Constants.DEFAULT_THEME);
       finalBorderColor =
-          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING
+              ? SELECTION_COLOR
               : theme.getOutlineColor();
     } else {
       finalBorderColor =
-          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING
+              ? SELECTION_COLOR
               : getBorderColor();
     }
     g2d.setColor(finalBorderColor);
@@ -375,14 +397,16 @@ public class DIPSwitch extends AbstractTransparentComponent<String> implements I
     g2d.setFont(project.getFont());
     Color finalLabelColor;
     if (outlineMode) {
-      Theme theme =
+      Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY,
-          (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+          Constants.DEFAULT_THEME);
       finalLabelColor =
-          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING
+              ? LABEL_COLOR_SELECTED
               : theme.getOutlineColor();
     } else {
       finalLabelColor =
-          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING
+              ? LABEL_COLOR_SELECTED
               : getLabelColor();
     }
     g2d.setColor(finalLabelColor);
@@ -441,9 +465,11 @@ public class DIPSwitch extends AbstractTransparentComponent<String> implements I
     int tickHoleLength = (int) (width * 0.4);
     for (int i = 0; i < 4; i++) {
       g2d.setColor(TICK_COLOR.darker());
-      g2d.fillRect((width - tickHoleLength) / 2, (height / 5) * (i + 1) - tickSize / 2, tickHoleLength, tickSize);
+      g2d.fillRect((width - tickHoleLength) / 2, (height / 5) * (i + 1) - tickSize / 2,
+          tickHoleLength, tickSize);
       g2d.setColor(TICK_COLOR);
-      g2d.fillRect((width - tickHoleLength) / 2, (height / 5) * (i + 1) - tickSize / 2, tickSize, tickSize);
+      g2d.fillRect((width - tickHoleLength) / 2, (height / 5) * (i + 1) - tickSize / 2, tickSize,
+          tickSize);
     }
   }
 
@@ -536,7 +562,8 @@ public class DIPSwitch extends AbstractTransparentComponent<String> implements I
   @Override
   public boolean arePointsConnected(int index1, int index2, int position) {
     String binary = toBinary(position);
-    return Math.abs(index1 - index2) == getSwitchCount().getValue() && binary.charAt(index1 < index2 ? index1 : index2) == '1';
+    return Math.abs(index1 - index2) == getSwitchCount().getValue()
+        && binary.charAt(index1 < index2 ? index1 : index2) == '1';
   }
 
   @Override
@@ -548,7 +575,8 @@ public class DIPSwitch extends AbstractTransparentComponent<String> implements I
   public Rectangle2D getCachingBounds() {
     int margin = 20;
     Rectangle2D bounds = getBody()[0].getBounds2D();
-    return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin, bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin);
+    return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin,
+        bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin);
   }
 
   private String toBinary(int n) {

diylc/diylc-library/src/org/diylc/components/electromechanical/TactileMicroSwitch.java

@@ -1,23 +1,20 @@
 /*
-
+ * 
-    DIY Layout Creator (DIYLC).
+ * DIY Layout Creator (DIYLC). Copyright (c) 2009-2018 held jointly by the individual authors.
-    Copyright (c) 2009-2018 held jointly by the individual authors.
+ * 
-
+ * This file is part of DIYLC.
-    This file is part of DIYLC.
+ * 
-
+ * DIYLC is free software: you can redistribute it and/or modify it under the terms of the GNU
-    DIYLC is free software: you can redistribute it and/or modify
+ * General Public License as published by the Free Software Foundation, either version 3 of the
-    it under the terms of the GNU General Public License as published by
+ * License, or (at your option) any later version.
-    the Free Software Foundation, either version 3 of the License, or
+ * 
-    (at your option) any later version.
+ * DIYLC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-    DIYLC is distributed in the hope that it will be useful,
+ * Public License for more details.
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * You should have received a copy of the GNU General Public License along with DIYLC. If not, see
-    GNU General Public License for more details.
+ * <http://www.gnu.org/licenses/>.
-
+ * 
-    You should have received a copy of the GNU General Public License
-    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
-
  */
 package org.diylc.components.electromechanical;
 
@@ -51,10 +48,10 @@ import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;
 
-@ComponentDescriptor(name = "Tactile Micro-Switch", author = "Branislav Stojkovic", category = "Electro-Mechanical",
+@ComponentDescriptor(name = "Tactile Micro-Switch", author = "Branislav Stojkovic",
-    instanceNamePrefix = "SW", description = "4-pin tactile momentary switch",
+    category = "Electro-Mechanical", instanceNamePrefix = "SW",
-    zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE, transformer = DIL_ICTransformer.class,
+    description = "4-pin tactile momentary switch", zOrder = IDIYComponent.COMPONENT,
-    enableCache = true)
+    keywordPolicy = KeywordPolicy.SHOW_VALUE, enableCache = true)
 public class TactileMicroSwitch extends AbstractLabeledComponent<String> {
 
   private static final long serialVersionUID = 1L;
@@ -186,8 +183,10 @@ public class TactileMicroSwitch extends AbstractLabeledComponent<String> {
         default:
           throw new RuntimeException("Unexpected orientation: " + orientation);
       }
-      controlPoints[i] = new Point2D.Double((int) (firstPoint.getX() + dx1), (int) (firstPoint.getY() + dy1));
+      controlPoints[i] =
-      controlPoints[i + PIN_COUNT / 2] = new Point2D.Double((int) (firstPoint.getX() + dx2), (int) (firstPoint.getY() + dy2));
+          new Point2D.Double((int) (firstPoint.getX() + dx1), (int) (firstPoint.getY() + dy1));
+      controlPoints[i + PIN_COUNT / 2] =
+          new Point2D.Double((int) (firstPoint.getX() + dx2), (int) (firstPoint.getY() + dy2));
     }
   }
 
@@ -217,8 +216,8 @@ public class TactileMicroSwitch extends AbstractLabeledComponent<String> {
   }
 
   @Override
-  public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
+  public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
-      IDrawingObserver drawingObserver) {
+      Project project, IDrawingObserver drawingObserver) {
     if (checkPointsClipped(g2d.getClip())) {
       return;
     }
@@ -229,7 +228,8 @@ public class TactileMicroSwitch extends AbstractLabeledComponent<String> {
     if (!outlineMode) {
       int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2;
       for (Point2D point : controlPoints) {
-        Rectangle2D rect = new Rectangle2D.Double(point.getX() - pinSize / 2, point.getY() - pinSize / 2, pinSize, pinSize); 
+        Rectangle2D rect = new Rectangle2D.Double(point.getX() - pinSize / 2,
+            point.getY() - pinSize / 2, pinSize, pinSize);
         g2d.setColor(PIN_COLOR);
         g2d.fill(rect);
         g2d.setColor(PIN_BORDER_COLOR);
@@ -252,14 +252,16 @@ public class TactileMicroSwitch extends AbstractLabeledComponent<String> {
 
     Color finalBorderColor;
     if (outlineMode) {
-      Theme theme =
+      Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY,
-          (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+          Constants.DEFAULT_THEME);
       finalBorderColor =
-          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING
+              ? SELECTION_COLOR
               : theme.getOutlineColor();
     } else {
       finalBorderColor =
-          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING
+              ? SELECTION_COLOR
               : getBorderColor();
     }
     g2d.setColor(finalBorderColor);
@@ -278,14 +280,16 @@ public class TactileMicroSwitch extends AbstractLabeledComponent<String> {
 
     Color finalLabelColor;
     if (outlineMode) {
-      Theme theme =
+      Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY,
-          (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+          Constants.DEFAULT_THEME);
       finalLabelColor =
-          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING
+              ? LABEL_COLOR_SELECTED
               : theme.getOutlineColor();
     } else {
       finalLabelColor =
-          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING
+              ? LABEL_COLOR_SELECTED
               : getLabelColor();
     }
     g2d.setColor(finalLabelColor);
@@ -406,6 +410,7 @@ public class TactileMicroSwitch extends AbstractLabeledComponent<String> {
         maxY = p.getY();
     }
 
-    return new Rectangle2D.Double(minX - margin, minY - margin, maxX - minX + 2 * margin, maxY - minY + 2 * margin);
+    return new Rectangle2D.Double(minX - margin, minY - margin, maxX - minX + 2 * margin,
+        maxY - minY + 2 * margin);
   }
 }

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

@@ -58,7 +58,7 @@ import org.diylc.utils.Constants;
 
 @ComponentDescriptor(name = "Mini Signal Transformer", author = "Branislav Stojkovic", category = "Passive",
     instanceNamePrefix = "TR", description = "Miniature PCB-mount signal transformer with EI core",
-    zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE, transformer = DIL_ICTransformer.class)
+    zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE)
 public class AudioTransformer extends AbstractMultiPartComponent<String> {
 
   private static final long serialVersionUID = 1L;

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

@@ -1,23 +1,20 @@
 /*
-
+ * 
-    DIY Layout Creator (DIYLC).
+ * DIY Layout Creator (DIYLC). Copyright (c) 2009-2018 held jointly by the individual authors.
-    Copyright (c) 2009-2018 held jointly by the individual authors.
+ * 
-
+ * This file is part of DIYLC.
-    This file is part of DIYLC.
+ * 
-
+ * DIYLC is free software: you can redistribute it and/or modify it under the terms of the GNU
-    DIYLC is free software: you can redistribute it and/or modify
+ * General Public License as published by the Free Software Foundation, either version 3 of the
-    it under the terms of the GNU General Public License as published by
+ * License, or (at your option) any later version.
-    the Free Software Foundation, either version 3 of the License, or
+ * 
-    (at your option) any later version.
+ * DIYLC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-    DIYLC is distributed in the hope that it will be useful,
+ * Public License for more details.
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * You should have received a copy of the GNU General Public License along with DIYLC. If not, see
-    GNU General Public License for more details.
+ * <http://www.gnu.org/licenses/>.
-
+ * 
-    You should have received a copy of the GNU General Public License
-    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
-
  */
 package org.diylc.components.semiconductors;
 
@@ -45,7 +42,6 @@ import org.diylc.common.VerticalAlignment;
 import org.diylc.components.AbstractLabeledComponent;
 import org.diylc.components.AbstractLeadedComponent.LabelOriantation;
 import org.diylc.components.RoundedPolygon;
-import org.diylc.components.transform.DIL_ICTransformer;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
@@ -61,10 +57,10 @@ import org.diylc.core.measures.SizeUnit;
 import org.diylc.core.measures.Voltage;
 import org.diylc.utils.Constants;
 
-@ComponentDescriptor(name = "Bridge Rectifier", author = "Branislav Stojkovic", category = "Semiconductors",
+@ComponentDescriptor(name = "Bridge Rectifier", author = "Branislav Stojkovic",
-    instanceNamePrefix = "BR", description = "Few variations of bridge rectifier chips",
+    category = "Semiconductors", instanceNamePrefix = "BR",
-    zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE, transformer = DIL_ICTransformer.class,
+    description = "Few variations of bridge rectifier chips", zOrder = IDIYComponent.COMPONENT,
-    enableCache = true)
+    keywordPolicy = KeywordPolicy.SHOW_VALUE, enableCache = true)
 public class BridgeRectifier extends AbstractLabeledComponent<String> {
 
   private static final long serialVersionUID = 1L;
@@ -103,7 +99,8 @@ public class BridgeRectifier extends AbstractLabeledComponent<String> {
 
   private String value = "";
   private Orientation orientation = Orientation.DEFAULT;
-  private Point2D[] controlPoints = new Point2D[] { new Point2D.Double(0, 0), new Point2D.Double(0, 0), new Point2D.Double(0, 0), new Point2D.Double(0, 0) };
+  private Point2D[] controlPoints = new Point2D[] {new Point2D.Double(0, 0),
+      new Point2D.Double(0, 0), new Point2D.Double(0, 0), new Point2D.Double(0, 0)};
   private String[] pointLabels = new String[] {"+", "~", "~", "-"};
   protected Display display = Display.BOTH;
   private Color bodyColor = BODY_COLOR;
@@ -241,7 +238,8 @@ public class BridgeRectifier extends AbstractLabeledComponent<String> {
           theta = Math.PI * 3 / 2;
           break;
       }
-      AffineTransform rotation = AffineTransform.getRotateInstance(theta, firstPoint.getX(), firstPoint.getY());
+      AffineTransform rotation =
+          AffineTransform.getRotateInstance(theta, firstPoint.getX(), firstPoint.getY());
 
       for (int i = 1; i < controlPoints.length; i++) {
         rotation.transform(controlPoints[i], controlPoints[i]);
@@ -254,8 +252,10 @@ public class BridgeRectifier extends AbstractLabeledComponent<String> {
     if (body == null) {
       body = new Area[2];
 
-      double centerX = (controlPoints[0].getX() + controlPoints[1].getX() + controlPoints[2].getX() + controlPoints[3].getX()) / 4;
+      double centerX = (controlPoints[0].getX() + controlPoints[1].getX() + controlPoints[2].getX()
-      double centerY = (controlPoints[0].getY() + controlPoints[1].getY() + controlPoints[2].getY() + controlPoints[3].getY()) / 4;
+          + controlPoints[3].getX()) / 4;
+      double centerY = (controlPoints[0].getY() + controlPoints[1].getY() + controlPoints[2].getY()
+          + controlPoints[3].getY()) / 4;
 
       int width = 0;
       int length = 0;
@@ -289,11 +289,13 @@ public class BridgeRectifier extends AbstractLabeledComponent<String> {
         case MiniDIP1:
         case MiniDIP2:
         case InLine:
-          body[0] = new Area(new RoundRectangle2D.Double(centerX - length / 2, centerY - width / 2, length, width, EDGE_RADIUS, EDGE_RADIUS));
+          body[0] = new Area(new RoundRectangle2D.Double(centerX - length / 2, centerY - width / 2,
+              length, width, EDGE_RADIUS, EDGE_RADIUS));
           break;
         case MiniRound1:
         case MiniRound2:
-          body[0] = new Area(new Ellipse2D.Double(centerX - length / 2, centerY - width / 2, length, width));
+          body[0] = new Area(
+              new Ellipse2D.Double(centerX - length / 2, centerY - width / 2, length, width));
           break;
         case SquareBR3:
           double margin = (BR3_LENGTH.convertToPixels() - BR3_SPACING.convertToPixels()) / 2;
@@ -307,18 +309,20 @@ public class BridgeRectifier extends AbstractLabeledComponent<String> {
           // path.lineTo(centerX - width / 2, centerY - width / 2 + margin);
           // path.closePath();
 
-          RoundedPolygon poly = new RoundedPolygon(new Point2D[] {
+          RoundedPolygon poly =
-              new Point2D.Double(centerX, centerY - width / 2),
+              new RoundedPolygon(new Point2D[] {new Point2D.Double(centerX, centerY - width / 2),
                   new Point2D.Double(centerX + width / 2, centerY - width / 2),
                   new Point2D.Double(centerX + width / 2, centerY + width / 2),
                   new Point2D.Double(centerX - width / 2, centerY + width / 2),
                   new Point2D.Double(centerX - width / 2, (int) (centerY - width / 2 + margin)),
                   new Point2D.Double((int) (centerX - width / 2 + margin), centerY - width / 2),
 
-          }, new double[] { EDGE_RADIUS, EDGE_RADIUS, EDGE_RADIUS, EDGE_RADIUS / 2 , EDGE_RADIUS / 2});
+              }, new double[] {EDGE_RADIUS, EDGE_RADIUS, EDGE_RADIUS, EDGE_RADIUS / 2,
+                  EDGE_RADIUS / 2});
 
           body[0] = new Area(poly);
-          body[0].subtract(new Area(new Ellipse2D.Double(centerX - holeSize / 2, centerY - holeSize / 2, holeSize, holeSize)));
+          body[0].subtract(new Area(new Ellipse2D.Double(centerX - holeSize / 2,
+              centerY - holeSize / 2, holeSize, holeSize)));
 
           if (orientation != Orientation.DEFAULT) {
             double theta = 0;
@@ -346,15 +350,16 @@ public class BridgeRectifier extends AbstractLabeledComponent<String> {
 
   @SuppressWarnings("incomplete-switch")
   @Override
-  public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
+  public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
-      IDrawingObserver drawingObserver) {
+      Project project, IDrawingObserver drawingObserver) {
     if (checkPointsClipped(g2d.getClip())) {
       return;
     }
     Area mainArea = getBody()[0];
 
     PinShape pinShape = rectifierType.getPinShape();
-    int pinSize = (int) (pinShape == PinShape.Round ? ROUND_PIN_SIZE.convertToPixels() : SQUARE_PIN_SIZE.convertToPixels()) / 2 * 2;
+    int pinSize = (int) (pinShape == PinShape.Round ? ROUND_PIN_SIZE.convertToPixels()
+        : SQUARE_PIN_SIZE.convertToPixels()) / 2 * 2;
 
     g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1f));
     if (!outlineMode) {
@@ -362,9 +367,11 @@ public class BridgeRectifier extends AbstractLabeledComponent<String> {
         g2d.setColor(PIN_COLOR);
         Shape shape;
         if (pinShape == PinShape.Round)
-          shape = new Ellipse2D.Double(point.getX() - pinSize / 2, point.getY() - pinSize / 2, pinSize, pinSize);
+          shape = new Ellipse2D.Double(point.getX() - pinSize / 2, point.getY() - pinSize / 2,
+              pinSize, pinSize);
         else
-          shape = new Rectangle2D.Double(point.getX() - pinSize / 2, point.getY() - pinSize / 2, pinSize, pinSize);
+          shape = new Rectangle2D.Double(point.getX() - pinSize / 2, point.getY() - pinSize / 2,
+              pinSize, pinSize);
         g2d.fill(shape);
         g2d.setColor(PIN_BORDER_COLOR);
         g2d.draw(shape);
@@ -381,14 +388,16 @@ public class BridgeRectifier extends AbstractLabeledComponent<String> {
 
     Color finalBorderColor;
     if (outlineMode) {
-      Theme theme =
+      Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY,
-          (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+          Constants.DEFAULT_THEME);
       finalBorderColor =
-          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING
+              ? SELECTION_COLOR
               : theme.getOutlineColor();
     } else {
       finalBorderColor =
-          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING
+              ? SELECTION_COLOR
               : getBorderColor();
     }
     g2d.setColor(finalBorderColor);
@@ -416,14 +425,16 @@ public class BridgeRectifier extends AbstractLabeledComponent<String> {
 
     Color finalLabelColor;
     if (outlineMode) {
-      Theme theme =
+      Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY,
-          (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+          Constants.DEFAULT_THEME);
       finalLabelColor =
-          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING
+              ? LABEL_COLOR_SELECTED
               : theme.getOutlineColor();
     } else {
       finalLabelColor =
-          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING
+              ? LABEL_COLOR_SELECTED
               : getLabelColor();
     }
     g2d.setColor(finalLabelColor);
@@ -452,7 +463,8 @@ public class BridgeRectifier extends AbstractLabeledComponent<String> {
 
         AffineTransform oldTransform = g2d.getTransform();
 
-        if (getLabelOriantation() == LabelOriantation.Directional && (getOrientation() == Orientation.DEFAULT || getOrientation() == Orientation._180)) {
+        if (getLabelOriantation() == LabelOriantation.Directional
+            && (getOrientation() == Orientation.DEFAULT || getOrientation() == Orientation._180)) {
           double centerX = bounds.getX() + bounds.width / 2;
           double centerY = bounds.getY() + bounds.height / 2;
           g2d.rotate(-Math.PI / 2, centerX, centerY);
@@ -567,14 +579,16 @@ public class BridgeRectifier extends AbstractLabeledComponent<String> {
           break;
       }
 
-      StringUtils.drawCenteredText(g2d, pointLabels[i], point.getX() + dx, point.getY() + dy, HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
+      StringUtils.drawCenteredText(g2d, pointLabels[i], point.getX() + dx, point.getY() + dy,
+          HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
     }
   }
 
   @Override
   public void drawIcon(Graphics2D g2d, int width, int height) {
     int margin = (int) (2f * width / 32);
-    Area area = new Area(new Ellipse2D.Double(margin / 2, margin, width - 2 * margin, width - 2 * margin));
+    Area area =
+        new Area(new Ellipse2D.Double(margin / 2, margin, width - 2 * margin, width - 2 * margin));
     g2d.setColor(BODY_COLOR);
     g2d.fill(area);
     g2d.setColor(BORDER_COLOR);
@@ -587,10 +601,14 @@ public class BridgeRectifier extends AbstractLabeledComponent<String> {
     g2d.fillOval(width * 2 / 8, height * 6 / 8 - pinSize, pinSize, pinSize);
     g2d.setColor(LABEL_COLOR);
     g2d.setFont(LABEL_FONT.deriveFont(8f * width / 32));
-    StringUtils.drawCenteredText(g2d, "+", width * 2 / 8 + 1, height * 2 / 8 + 4 * width / 32, HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
+    StringUtils.drawCenteredText(g2d, "+", width * 2 / 8 + 1, height * 2 / 8 + 4 * width / 32,
-    StringUtils.drawCenteredText(g2d, "-", width * 2 / 8 + 1, height * 6 / 8 - 5 * width / 32, HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
+        HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
-    StringUtils.drawCenteredText(g2d, "~", width * 6 / 8 - 2 * width / 32, height * 2 / 8 + 5 * width / 32, HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
+    StringUtils.drawCenteredText(g2d, "-", width * 2 / 8 + 1, height * 6 / 8 - 5 * width / 32,
-    StringUtils.drawCenteredText(g2d, "~", width * 6 / 8 - 2 * width / 32, height * 6 / 8 - 5 * width / 32, HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
+        HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
+    StringUtils.drawCenteredText(g2d, "~", width * 6 / 8 - 2 * width / 32,
+        height * 2 / 8 + 5 * width / 32, HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
+    StringUtils.drawCenteredText(g2d, "~", width * 6 / 8 - 2 * width / 32,
+        height * 6 / 8 - 5 * width / 32, HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
   }
 
   @EditableProperty(name = "Body")
@@ -678,17 +696,15 @@ public class BridgeRectifier extends AbstractLabeledComponent<String> {
   public Rectangle2D getCachingBounds() {
     int margin = 20;
     Rectangle2D bounds = getBody()[0].getBounds2D();
-    return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin, bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin);
+    return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin,
+        bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin);
   }
 
   public static enum RectifierType {
 
-    MiniDIP1("DFM A", PinShape.Square), 
+    MiniDIP1("DFM A", PinShape.Square), MiniDIP2("DFM B", PinShape.Square), MiniRound1(
-    MiniDIP2("DFM B", PinShape.Square), 
+        "Round WOG A", PinShape.Round), MiniRound2("Round WOG B", PinShape.Round), InLine(
-    MiniRound1("Round WOG A", PinShape.Round), 
+            "In-Line D-44", PinShape.Round), SquareBR3("Square BR-3", PinShape.Round);
-    MiniRound2("Round WOG B", PinShape.Round), 
-    InLine("In-Line D-44", PinShape.Round), 
-    SquareBR3("Square BR-3", PinShape.Round);
 
     private String label;
     private PinShape pinShape;

diylc/diylc-swing/dict.txt

@@ -49,6 +49,7 @@ AWG
 Alternate
 And
 Angle Offset
+Apply Model
 B-C-E     BJT
 Background
 Box
@@ -103,6 +104,7 @@ I-G-O     REGULATOR
 Italiano
 Lin
 Log
+MPJA
 Markers
 Maximum number of switching combinations exceeded. Allowed: %s, actual: %s
 NPN
@@ -126,6 +128,8 @@ PCB
 PNP
 Poles
 Português
+RS
+RY1
 Rectangle
 Rev log
 S-G-D     JFET