- PREV CLASS PREV CLASS NEXT CLASS
FRAMES
- PREV CLASS PREV CLASS NEXT CLASS
FRAMES
+IAutoCreator
+
+
+
+
+
+
+
+
+
+
+org.diylc.core.annotations
+
+
+public interface IAutoCreator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+create
+
+java.util.List<IDIYComponent <?>> create (IDIYComponent <?> lastAdded)
+
+
+
+
+
+
+KeywordPolicy
+
+
+
+
+
+
+
+
+
+
+org.diylc.core.annotations
+
+
+java.lang.Object
+ KeywordPolicy >
+ org.diylc.core.annotations.KeywordPolicy
+
+
+All Implemented Interfaces: java.io.Serializable, java.lang.Comparable<KeywordPolicy >
+
+
+public enum KeywordPolicy extends java.lang.Enum<KeywordPolicy >
+
+
+
+
+
+
+
+
+
+
+
+
+
+Method Summary
+
+
+static KeywordPolicy valueOf
+
+
+static KeywordPolicy [] values
+
+
+
+Methods inherited from class java.lang.Enum
+
+compareTo, equals, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
+
+
+
+Methods inherited from class java.lang.Object
+
+getClass, notify, notifyAll, wait, wait, wait
+
+
+
+
+
+
+
+
+
+Enum Constant Detail
+
+
+
+SHOW_TYPE_NAME
+
+public static final KeywordPolicy SHOW_TYPE_NAME
+
+
+
+
+
+SHOW_VALUE
+
+public static final KeywordPolicy SHOW_VALUE
+
+
+
+
+
+NEVER_SHOW
+
+public static final KeywordPolicy NEVER_SHOW
+
+
+
+
+
+
+
+
+values
+
+public static KeywordPolicy [] values ()
+
+Returns an array containing the constants of this enum type, in
+the order they are declared. This method may be used to iterate
+over the constants as follows:
+
+for (KeywordPolicy c : KeywordPolicy.values())
+ System.out.println(c);
+
+
+
+
+Returns: an array containing the constants of this enum type, in
+the order they are declared
+
+
+valueOf
+
+public static KeywordPolicy valueOf (java.lang.String name)
+
+Returns the enum constant of this type with the specified name.
+The string must match exactly an identifier used to declare an
+enum constant in this type. (Extraneous whitespace characters are
+not permitted.)
+
+
+Parameters: name - the name of the enum constant to be returned.
+Returns: the enum constant with the specified name
+ Throws:
+java.lang.IllegalArgumentException - if this enum type has no constant
+with the specified name
+java.lang.NullPointerException - if the argument is null
+
+
+
+Uses of Class org.diylc.core.annotations.AutoCreator
+
+
+
+
+
+
+
+
+
+
+Uses of Class
+
+No usage of org.diylc.core.annotations.AutoCreator
+
+
Uses of Class org.diylc.core.annotations.ComponentDescriptor
-
Uses of Class org.diylc.core.annotations.EditableProperty
-
+Uses of Interface org.diylc.core.annotations.IAutoCreator
+
+
+
+
+
+
+
+
+
+
+Uses of Interface
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructors in org.diylc.common with parameters of type IAutoCreator
+
+
+ComponentType CreationMethod creationMethod,
+ java.lang.String category,
+ java.lang.String namePrefix,
+ java.lang.String author,
+ javax.swing.Icon icon,
+ java.lang.Class<? extends IDIYComponent <?>> instanceClass,
+ double zOrder,
+ boolean flexibleZOrder,
+ boolean stretchable,
+ BomPolicy bomPolicy,
+ boolean autoEdit,
+ boolean rotatable,
+ IAutoCreator autoCreator)
+
+
+
+
+
+
+
+
+
+
+
+Uses of Class org.diylc.core.annotations.KeywordPolicy
+
+
+
+
+
+
+
+
+
+
+Uses of Class
+
+
+
+
+
+
+
+
+
+
+
+
+
Uses of Class org.diylc.core.annotations.PositiveMeasureValidator
-
Uses of Class org.diylc.core.AllowAllValidator
-
Uses of Class org.diylc.core.ComponentState
-
Uses of Class org.diylc.core.ExpansionMode
-
Uses of Interface org.diylc.core.IDrawingObserver
-
Uses of Interface org.diylc.core.IPropertyValidator
-
Uses of Interface org.diylc.core.IView
-
Uses of Class org.diylc.core.Project.SpacingValidator
-
Uses of Class org.diylc.core.Project
-
Uses of Class org.diylc.core.Template
-
Uses of Class org.diylc.core.Theme
-
Uses of Class org.diylc.core.ValidationException
-
Uses of Class org.diylc.core.VisibilityPolicy
-
AbstractMeasure
-
Capacitance
-
CapacitanceUnit
-
Current
-
CurrentUnit
-
Inductance
-
InductanceUnit
-
Power
-
PowerUnit
-
Resistance
-
ResistanceUnit
-
Size
-
SizeUnit
-
Unit
-
Voltage
-
VoltageUnit
-
Uses of Class org.diylc.core.measures.AbstractMeasure
-
Uses of Class org.diylc.core.measures.Capacitance
-
Uses of Class org.diylc.core.measures.CapacitanceUnit
-
Uses of Class org.diylc.core.measures.Current
-
Uses of Class org.diylc.core.measures.CurrentUnit
-
Uses of Class org.diylc.core.measures.Inductance
-
Uses of Class org.diylc.core.measures.InductanceUnit
-
Uses of Class org.diylc.core.measures.Power
-
Uses of Class org.diylc.core.measures.PowerUnit
-
Uses of Class org.diylc.core.measures.Resistance
-
Uses of Class org.diylc.core.measures.ResistanceUnit
-
Uses of Class org.diylc.core.measures.Size
-
Uses of Class org.diylc.core.measures.SizeUnit
-
Uses of Interface org.diylc.core.measures.Unit
-
Uses of Class org.diylc.core.measures.Voltage
-
Uses of Class org.diylc.core.measures.VoltageUnit
-
org.diylc.core.measures
-
org.diylc.core.measures
-
org.diylc.core.measures Class Hierarchy
-java.lang.Object
java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
-org.diylc.core.measures.VoltageUnit Unit )
org.diylc.core.measures.InductanceUnit Unit )
+ org.diylc.core.measures.SizeUnit Unit )
+ org.diylc.core.measures.ResistanceUnit Unit )
+ org.diylc.core.measures.VoltageUnit Unit )
org.diylc.core.measures.CurrentUnit Unit )
org.diylc.core.measures.PowerUnit Unit )
org.diylc.core.measures.CapacitanceUnit Unit )
- org.diylc.core.measures.SizeUnit Unit )
- org.diylc.core.measures.ResistanceUnit Unit )
diff --git a/diylc/diylc-core/doc/org/diylc/core/measures/package-use.html b/diylc/diylc-core/doc/org/diylc/core/measures/package-use.html
index 0d5de25c..0c66ea38 100644
--- a/diylc/diylc-core/doc/org/diylc/core/measures/package-use.html
+++ b/diylc/diylc-core/doc/org/diylc/core/measures/package-use.html
@@ -2,12 +2,12 @@
-
+
Uses of Package org.diylc.core.measures
-
org.diylc.core
-
org.diylc.core
-
org.diylc.core Class Hierarchy
- java.lang.Object
IconLoader
-
Uses of Class org.diylc.images.IconLoader
-
org.diylc.images
-
org.diylc.images
-
org.diylc.images Class Hierarchy
-
Uses of Package org.diylc.images
-
IOldFileParser
-
Uses of Interface org.diylc.parsing.IOldFileParser
-
org.diylc.parsing
-
org.diylc.parsing
-
org.diylc.parsing Class Hierarchy
-
Uses of Package org.diylc.parsing
-
CommentEntity
-
CommentTree
-
CountryDetails
-
DashboardEntity
-
IServiceAPI
-
ProjectEntity
-
UserEntity
-
Uses of Class org.diylc.plugins.cloud.model.CommentEntity
-
Uses of Class org.diylc.plugins.cloud.model.CommentTree
-
Uses of Class org.diylc.plugins.cloud.model.CountryDetails
-
Uses of Class org.diylc.plugins.cloud.model.DashboardEntity
-
Uses of Interface org.diylc.plugins.cloud.model.IServiceAPI
-
Uses of Class org.diylc.plugins.cloud.model.ProjectEntity
-
Uses of Class org.diylc.plugins.cloud.model.UserEntity
-
org.diylc.plugins.cloud.model
-
org.diylc.plugins.cloud.model
-
org.diylc.plugins.cloud.model Class Hierarchy
-
Uses of Package org.diylc.plugins.cloud.model
-
CloudException
-
CloudListener
-
CloudPresenter
-
NotConnectedException
-
NotExistsException
-
NotLoggedInException
-
PagingProvider
-
Uses of Class org.diylc.plugins.cloud.presenter.CloudException
-
Uses of Interface org.diylc.plugins.cloud.presenter.CloudListener
-
Uses of Class org.diylc.plugins.cloud.presenter.CloudPresenter
-
Uses of Class org.diylc.plugins.cloud.presenter.NotConnectedException
-
Uses of Class org.diylc.plugins.cloud.presenter.NotExistsException
-
Uses of Class org.diylc.plugins.cloud.presenter.NotLoggedInException
-
Uses of Class org.diylc.plugins.cloud.presenter.PagingProvider
-
org.diylc.plugins.cloud.presenter
-
org.diylc.plugins.cloud.presenter
-
org.diylc.plugins.cloud.presenter Class Hierarchy
-
Uses of Package org.diylc.plugins.cloud.presenter
-
CalcUtils
-
ComparatorFactory
-
ComponentProcessor
-
DrawingManager
-
InstantiationManager
-
PCBLayerFiler
-
PointConverter
-
ProjectFileManager
-
Uses of Class org.diylc.presenter.CalcUtils
-
Uses of Class org.diylc.presenter.ComparatorFactory
-
Uses of Class org.diylc.presenter.ComponentProcessor
-
Uses of Class org.diylc.presenter.DrawingManager
-
Uses of Class org.diylc.presenter.InstantiationManager
-
Uses of Class org.diylc.presenter.PCBLayerFiler
-
Uses of Class org.diylc.presenter.PointConverter
-
Uses of Class org.diylc.presenter.Presenter
-
Uses of Class org.diylc.presenter.ProjectFileManager
-
org.diylc.presenter
-
org.diylc.presenter
-
org.diylc.presenter Class Hierarchy
-
Uses of Package org.diylc.presenter
-
BomEntry
-
BomMaker
-
Constants
-
MemoryCleaner
-
Pair
-
Uses of Class org.diylc.utils.BomEntry
-
Uses of Class org.diylc.utils.BomMaker
-
Uses of Class org.diylc.utils.Constants
-
Uses of Class org.diylc.utils.MemoryCleaner
-
Uses of Class org.diylc.utils.Pair
-
org.diylc.utils
-
org.diylc.utils
-
org.diylc.utils Class Hierarchy
-
Uses of Package org.diylc.utils
- words = new HashSet();
+ for (IDIYComponent c : project.getComponents()) {
+ ComponentType cType =
+ ComponentProcessor.getInstance().extractComponentTypeFrom((Class>) c.getClass());
+ if (cType.getKeywordPolicy() == KeywordPolicy.SHOW_TYPE_NAME)
+ words.add(cType.getName().toLowerCase());
+ if (cType.getKeywordPolicy() == KeywordPolicy.SHOW_VALUE && c.getValueForDisplay() != null
+ && c.getValueForDisplay().trim().length() > 0)
+ words.add(c.getValueForDisplay().trim().toLowerCase());
+ }
+ StringBuilder sb = new StringBuilder();
+ for (String w : words)
+ sb.append(w).append(",");
+ if (sb.length() > 0)
+ sb.deleteCharAt(sb.length() - 1);
+ return sb.toString();
+ }
private String getMachineId() {
if (machineId == null) {
diff --git a/diylc/diylc-core/src/org/diylc/presenter/ComponentProcessor.java b/diylc/diylc-core/src/org/diylc/presenter/ComponentProcessor.java
index 03e1c6ec..1250ab23 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/ComponentProcessor.java
+++ b/diylc/diylc-core/src/org/diylc/presenter/ComponentProcessor.java
@@ -3,6 +3,7 @@ package org.diylc.presenter;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.RenderingHints;
+import java.awt.Desktop.Action;
import java.awt.image.BufferedImage;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -25,6 +26,7 @@ import org.diylc.core.annotations.BomPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.annotations.IAutoCreator;
+import org.diylc.core.annotations.KeywordPolicy;
/**
* Utility class with component processing methods.
@@ -73,6 +75,7 @@ public class ComponentProcessor {
boolean autoEdit;
boolean rotatable;
IAutoCreator autoCreator = null;
+ KeywordPolicy keywordPolicy;
if (clazz.isAnnotationPresent(ComponentDescriptor.class)) {
ComponentDescriptor annotation = clazz.getAnnotation(ComponentDescriptor.class);
name = annotation.name();
@@ -87,6 +90,7 @@ public class ComponentProcessor {
bomPolicy = annotation.bomPolicy();
autoEdit = annotation.autoEdit();
rotatable = annotation.rotatable();
+ keywordPolicy = annotation.keywordPolicy();
} else {
name = clazz.getSimpleName();
description = "";
@@ -100,6 +104,7 @@ public class ComponentProcessor {
bomPolicy = BomPolicy.SHOW_ALL_NAMES;
autoEdit = true;
rotatable = true;
+ keywordPolicy = KeywordPolicy.NEVER_SHOW;
}
if (clazz.isAnnotationPresent(AutoCreator.class)) {
AutoCreator annotation = clazz.getAnnotation(AutoCreator.class);
@@ -127,7 +132,7 @@ public class ComponentProcessor {
}
ComponentType componentType =
new ComponentType(name, description, creationMethod, category, namePrefix, author, icon, clazz, zOrder,
- flexibleZOrder, stretchable, bomPolicy, autoEdit, rotatable, autoCreator);
+ flexibleZOrder, stretchable, bomPolicy, autoEdit, rotatable, autoCreator, keywordPolicy);
componentTypeMap.put(clazz.getName(), componentType);
return componentType;
}
diff --git a/diylc/diylc-core/src/org/diylc/presenter/InstantiationManager.java b/diylc/diylc-core/src/org/diylc/presenter/InstantiationManager.java
index 1156c037..7877c945 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/InstantiationManager.java
+++ b/diylc/diylc-core/src/org/diylc/presenter/InstantiationManager.java
@@ -19,6 +19,7 @@ import org.diylc.core.CreationMethod;
import org.diylc.core.IDIYComponent;
import org.diylc.core.Project;
import org.diylc.core.Template;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
/**
@@ -40,7 +41,7 @@ public class InstantiationManager {
private static final ComponentType clipboardType = new ComponentType("Clipboard contents",
"Components from the clipboard", CreationMethod.SINGLE_CLICK, "Multi", "", "", null, null, 0, false, false, null,
- false, true, null);
+ false, true, null, KeywordPolicy.NEVER_SHOW);
public InstantiationManager() {}
diff --git a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
index d7579c34..867307e8 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
+++ b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
@@ -89,7 +89,8 @@ public class Presenter implements IPlugInPort {
private Project currentProject;
private Map> componentTypes;
/**
- * {@link ComponentType}s that can be autocreated, like Solder Pads
+ * {@link List} of {@link IAutoCreator} objects that are capable of creating more components
+ * automatically when a component is created, e.g. Solder Pads.
*/
private List autoCreators;
// Maps component class names to ComponentType objects.
@@ -1643,9 +1644,9 @@ public class Presenter implements IPlugInPort {
// Check if we should auto-create something.
for (IAutoCreator creator : this.getAutoCreators()) {
- List> newComponents = creator.createIfNeeded(component);
+ List> newComponents = creator.createIfNeeded(component);
if (newComponents != null) {
- for(IDIYComponent c : newComponents)
+ for (IDIYComponent c : newComponents)
addComponent(c, false);
}
}
diff --git a/diylc/diylc-library/src/org/diylc/components/boards/Breadboard.java b/diylc/diylc-library/src/org/diylc/components/boards/Breadboard.java
index 1328f1d2..e1fc9ceb 100644
--- a/diylc/diylc-library/src/org/diylc/components/boards/Breadboard.java
+++ b/diylc/diylc-library/src/org/diylc/components/boards/Breadboard.java
@@ -15,12 +15,14 @@ import org.diylc.core.Project;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.BomPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
@ComponentDescriptor(name = "Breadboard", category = "Boards", author = "Branislav Stojkovic",
description = "Prototyping solderless breadboard", instanceNamePrefix = "BB", stretchable = false,
- zOrder = IDIYComponent.BOARD, bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false)
+ zOrder = IDIYComponent.BOARD, bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false,
+ keywordPolicy = KeywordPolicy.SHOW_TYPE_NAME)
public class Breadboard extends AbstractComponent {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/boards/EyeletBoard.java b/diylc/diylc-library/src/org/diylc/components/boards/EyeletBoard.java
index 3870c14f..0318ca62 100644
--- a/diylc/diylc-library/src/org/diylc/components/boards/EyeletBoard.java
+++ b/diylc/diylc-library/src/org/diylc/components/boards/EyeletBoard.java
@@ -13,13 +13,14 @@ import org.diylc.core.Project;
import org.diylc.core.annotations.BomPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@ComponentDescriptor(name = "Eyelet Board", category = "Boards", author = "Branislav Stojkovic",
zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Perforated board with eyelets",
- bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false)
+ bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false, keywordPolicy = KeywordPolicy.SHOW_TYPE_NAME)
public class EyeletBoard extends AbstractBoard {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/boards/MarshallPerfBoard.java b/diylc/diylc-library/src/org/diylc/components/boards/MarshallPerfBoard.java
index df64f563..6176027b 100644
--- a/diylc/diylc-library/src/org/diylc/components/boards/MarshallPerfBoard.java
+++ b/diylc/diylc-library/src/org/diylc/components/boards/MarshallPerfBoard.java
@@ -13,6 +13,7 @@ import org.diylc.core.Project;
import org.diylc.core.annotations.BomPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@@ -20,7 +21,7 @@ import org.diylc.utils.Constants;
@ComponentDescriptor(name = "Marshall Style Perf Board", category = "Boards", author = "Branislav Stojkovic",
zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board",
description = "Perforated board as found on some Marshall and Trainwreck amps",
- bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false)
+ bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false, keywordPolicy = KeywordPolicy.SHOW_TYPE_NAME)
public class MarshallPerfBoard extends AbstractBoard {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/boards/PerfBoard.java b/diylc/diylc-library/src/org/diylc/components/boards/PerfBoard.java
index b121fa9d..768a6b1e 100644
--- a/diylc/diylc-library/src/org/diylc/components/boards/PerfBoard.java
+++ b/diylc/diylc-library/src/org/diylc/components/boards/PerfBoard.java
@@ -13,13 +13,14 @@ import org.diylc.core.Project;
import org.diylc.core.annotations.BomPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@ComponentDescriptor(name = "Perf Board w/ Pads", category = "Boards", author = "Branislav Stojkovic",
zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Perforated board with solder pads",
- bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false)
+ bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false, keywordPolicy = KeywordPolicy.SHOW_TYPE_NAME)
public class PerfBoard extends AbstractBoard {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/boards/TriPadBoard.java b/diylc/diylc-library/src/org/diylc/components/boards/TriPadBoard.java
index d6495e92..c2ba28cc 100644
--- a/diylc/diylc-library/src/org/diylc/components/boards/TriPadBoard.java
+++ b/diylc/diylc-library/src/org/diylc/components/boards/TriPadBoard.java
@@ -14,13 +14,15 @@ import org.diylc.core.IDrawingObserver;
import org.diylc.core.Project;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@ComponentDescriptor(name = "TriPad Board", category = "Boards", author = "Hauke Juhls", zOrder = IDIYComponent.BOARD,
instanceNamePrefix = "Board",
- description = "Perforated FR4 board with copper strips connecting 3 holes in a row (aka TriPad Board)")
+ description = "Perforated FR4 board with copper strips connecting 3 holes in a row (aka TriPad Board)",
+ keywordPolicy = KeywordPolicy.SHOW_TYPE_NAME)
public class TriPadBoard extends AbstractBoard {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/boards/VeroBoard.java b/diylc/diylc-library/src/org/diylc/components/boards/VeroBoard.java
index 6d79bd7e..8edcf940 100644
--- a/diylc/diylc-library/src/org/diylc/components/boards/VeroBoard.java
+++ b/diylc/diylc-library/src/org/diylc/components/boards/VeroBoard.java
@@ -15,6 +15,7 @@ import org.diylc.core.Project;
import org.diylc.core.annotations.BomPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@@ -22,7 +23,7 @@ import org.diylc.utils.Constants;
@ComponentDescriptor(name = "Vero Board", category = "Boards", author = "Branislav Stojkovic",
zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board",
description = "Perforated FR4 board with copper strips connecting all holes in a row",
- bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false)
+ bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false, keywordPolicy = KeywordPolicy.SHOW_TYPE_NAME)
public class VeroBoard extends AbstractBoard {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/connectivity/Eyelet.java b/diylc/diylc-library/src/org/diylc/components/connectivity/Eyelet.java
index a6f544ba..5e23d5f1 100644
--- a/diylc/diylc-library/src/org/diylc/components/connectivity/Eyelet.java
+++ b/diylc/diylc-library/src/org/diylc/components/connectivity/Eyelet.java
@@ -13,13 +13,15 @@ import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.BomPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@ComponentDescriptor(name = "Eyelet", category = "Connectivity", author = "Branislav Stojkovic",
description = "Eyelet or turret terminal", instanceNamePrefix = "Eyelet", stretchable = false,
- zOrder = IDIYComponent.TRACE + 0.1, bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false)
+ zOrder = IDIYComponent.TRACE + 0.1, bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false,
+ keywordPolicy = KeywordPolicy.SHOW_TYPE_NAME)
public class Eyelet extends AbstractComponent {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/BJTSymbol.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/BJTSymbol.java
index 88ae26b0..1d78a088 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/BJTSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/BJTSymbol.java
@@ -11,10 +11,11 @@ import org.diylc.common.ObjectCache;
import org.diylc.core.IDIYComponent;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
@ComponentDescriptor(name = "BJT Symbol", author = "Branislav Stojkovic", category = "Schematics",
instanceNamePrefix = "Q", description = "Bipolar junction transistor schematic symbol", stretchable = false,
- zOrder = IDIYComponent.COMPONENT, rotatable = true)
+ zOrder = IDIYComponent.COMPONENT, rotatable = true, keywordPolicy = KeywordPolicy.SHOW_VALUE)
public class BJTSymbol extends AbstractTransistorSymbol {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/DIL_IC.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/DIL_IC.java
index 34ea94a6..3082a46e 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/DIL_IC.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/DIL_IC.java
@@ -27,13 +27,14 @@ import org.diylc.core.Theme;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@ComponentDescriptor(name = "DIP IC", author = "Branislav Stojkovic", category = "Semiconductors",
instanceNamePrefix = "IC", description = "Dual-in-line package IC", stretchable = false,
- zOrder = IDIYComponent.COMPONENT)
+ zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE)
public class DIL_IC extends AbstractTransparentComponent {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/ICSymbol.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/ICSymbol.java
index f2236f11..a4eb236c 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/ICSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/ICSymbol.java
@@ -26,13 +26,14 @@ import org.diylc.core.Theme;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@ComponentDescriptor(name = "IC Symbol", author = "Branislav Stojkovic", category = "Schematics",
instanceNamePrefix = "IC", description = "IC symbol with 3 or 5 contacts", stretchable = false,
- zOrder = IDIYComponent.COMPONENT, rotatable = false)
+ zOrder = IDIYComponent.COMPONENT, rotatable = false, keywordPolicy = KeywordPolicy.SHOW_VALUE)
public class ICSymbol extends AbstractTransparentComponent {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/JFETSymbol.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/JFETSymbol.java
index 81a38af9..4acb6690 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/JFETSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/JFETSymbol.java
@@ -9,10 +9,11 @@ import org.diylc.common.ObjectCache;
import org.diylc.core.IDIYComponent;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
@ComponentDescriptor(name = "JFET Symbol", author = "Branislav Stojkovic", category = "Schematics",
instanceNamePrefix = "Q", description = "JFET transistor schematic symbol", stretchable = false,
- zOrder = IDIYComponent.COMPONENT, rotatable = true)
+ zOrder = IDIYComponent.COMPONENT, rotatable = true, keywordPolicy = KeywordPolicy.SHOW_VALUE)
public class JFETSymbol extends AbstractTransistorSymbol {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/MOSFETSymbol.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/MOSFETSymbol.java
index c7295bbe..1e7a0714 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/MOSFETSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/MOSFETSymbol.java
@@ -9,10 +9,11 @@ import org.diylc.common.ObjectCache;
import org.diylc.core.IDIYComponent;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
@ComponentDescriptor(name = "MOSFET Symbol", author = "Branislav Stojkovic", category = "Schematics",
instanceNamePrefix = "Q", description = "MOSFET transistor schematic symbol", stretchable = false,
- zOrder = IDIYComponent.COMPONENT, rotatable = true)
+ zOrder = IDIYComponent.COMPONENT, rotatable = true, keywordPolicy = KeywordPolicy.SHOW_VALUE)
public class MOSFETSymbol extends AbstractTransistorSymbol {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/SIL_IC.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/SIL_IC.java
index c1b39b37..8208e5cd 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/SIL_IC.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/SIL_IC.java
@@ -26,13 +26,14 @@ import org.diylc.core.Theme;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@ComponentDescriptor(name = "SIP IC", author = "Branislav Stojkovic", category = "Semiconductors",
instanceNamePrefix = "IC", description = "Single-in-line package IC", stretchable = false,
- zOrder = IDIYComponent.COMPONENT)
+ zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE)
public class SIL_IC extends AbstractTransparentComponent {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java
index 5fcfb517..08e42d9a 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java
@@ -26,13 +26,14 @@ import org.diylc.core.Theme;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@ComponentDescriptor(name = "Transistor (TO-1 package)", author = "Branislav Stojkovic", category = "Semiconductors",
instanceNamePrefix = "Q", description = "Transistor with small metal body", stretchable = false,
- zOrder = IDIYComponent.COMPONENT)
+ zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE)
public class TransistorTO1 extends AbstractTransparentComponent {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO220.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO220.java
index 19857315..8e3674b5 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO220.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO220.java
@@ -26,13 +26,14 @@ import org.diylc.core.Theme;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@ComponentDescriptor(name = "Transistor (TO-220 package)", author = "Branislav Stojkovic", category = "Semiconductors",
instanceNamePrefix = "Q", description = "Transistors with metal tab for heat sink mounting", stretchable = false,
- zOrder = IDIYComponent.COMPONENT)
+ zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE)
public class TransistorTO220 extends AbstractTransparentComponent {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO3.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO3.java
index f9f93f94..c328a8ac 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO3.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO3.java
@@ -27,13 +27,14 @@ import org.diylc.core.Theme;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@ComponentDescriptor(name = "Transistor (TO-3 package)", author = "Branislav Stojkovic", category = "Semiconductors",
instanceNamePrefix = "Q", description = "Transistor with large metal body", stretchable = false,
- zOrder = IDIYComponent.COMPONENT)
+ zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE)
public class TransistorTO3 extends AbstractTransparentComponent {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO92.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO92.java
index 411cb702..5cb04748 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO92.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO92.java
@@ -25,13 +25,14 @@ import org.diylc.core.Theme;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@ComponentDescriptor(name = "Transistor (TO-92 package)", author = "Branislav Stojkovic", category = "Semiconductors",
instanceNamePrefix = "Q", description = "Transistor with small plastic or epoxy body", stretchable = false,
- zOrder = IDIYComponent.COMPONENT)
+ zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE)
public class TransistorTO92 extends AbstractTransparentComponent {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/tube/DiodeSymbol.java b/diylc/diylc-library/src/org/diylc/components/tube/DiodeSymbol.java
index b75476ce..a7c9eb09 100644
--- a/diylc/diylc-library/src/org/diylc/components/tube/DiodeSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/tube/DiodeSymbol.java
@@ -13,10 +13,11 @@ import org.diylc.core.ValidationException;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
@ComponentDescriptor(name = "Diode Symbol", author = "Branislav Stojkovic", category = "Schematics",
instanceNamePrefix = "V", description = "Diode tube symbol", stretchable = false, zOrder = IDIYComponent.COMPONENT,
- rotatable = false)
+ rotatable = false, keywordPolicy = KeywordPolicy.SHOW_VALUE)
public class DiodeSymbol extends AbstractTubeSymbol {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/tube/PentodeSymbol.java b/diylc/diylc-library/src/org/diylc/components/tube/PentodeSymbol.java
index 6cbb39d1..aabcc6c9 100644
--- a/diylc/diylc-library/src/org/diylc/components/tube/PentodeSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/tube/PentodeSymbol.java
@@ -12,10 +12,11 @@ import org.diylc.core.IDIYComponent;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
@ComponentDescriptor(name = "Pentode Symbol", author = "Branislav Stojkovic", category = "Schematics",
instanceNamePrefix = "V", description = "Pentode tube symbol", stretchable = false,
- zOrder = IDIYComponent.COMPONENT, rotatable = false)
+ zOrder = IDIYComponent.COMPONENT, rotatable = false, keywordPolicy = KeywordPolicy.SHOW_VALUE)
public class PentodeSymbol extends AbstractTubeSymbol {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/tube/TriodeSymbol.java b/diylc/diylc-library/src/org/diylc/components/tube/TriodeSymbol.java
index 3d1370b9..0cf04cfc 100644
--- a/diylc/diylc-library/src/org/diylc/components/tube/TriodeSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/tube/TriodeSymbol.java
@@ -12,10 +12,11 @@ import org.diylc.core.IDIYComponent;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
@ComponentDescriptor(name = "Triode Symbol", author = "Branislav Stojkovic", category = "Schematics",
instanceNamePrefix = "V", description = "Triode tube symbol", stretchable = false,
- zOrder = IDIYComponent.COMPONENT, rotatable = false)
+ zOrder = IDIYComponent.COMPONENT, rotatable = false, keywordPolicy = KeywordPolicy.SHOW_VALUE)
public class TriodeSymbol extends AbstractTubeSymbol {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-library/src/org/diylc/components/tube/TubeSocket.java b/diylc/diylc-library/src/org/diylc/components/tube/TubeSocket.java
index bbb2fbef..6e6e0ad7 100644
--- a/diylc/diylc-library/src/org/diylc/components/tube/TubeSocket.java
+++ b/diylc/diylc-library/src/org/diylc/components/tube/TubeSocket.java
@@ -22,13 +22,14 @@ import org.diylc.core.Theme;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@ComponentDescriptor(name = "Tube Socket", author = "Branislav Stojkovic", category = "Tubes",
instanceNamePrefix = "V", description = "Various types of tube/valve sockets", stretchable = false,
- zOrder = IDIYComponent.COMPONENT)
+ zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE)
public class TubeSocket extends AbstractTransparentComponent {
private static final long serialVersionUID = 1L;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/UploadDialog.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/UploadDialog.java
index 9b8b9cc3..44bd1071 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/UploadDialog.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/UploadDialog.java
@@ -32,274 +32,258 @@ import org.diylc.swingframework.ButtonDialog;
public class UploadDialog extends ButtonDialog {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- private static final String BULLET = " • ";
- private static final String TERMS_HTML = ""
- + BULLET
- + "All content uploaded to DIY Cloud is shared under Creative Commons 3.0 Licence. java.lang.Enum<KeywordPolicy> +