Commit f7f12850 authored by Simon Barner's avatar Simon Barner
Browse files

- Fix comments

- Remove spurious blank lines
parent 46e09e2a
......@@ -39,7 +39,7 @@ import org.fortiss.tooling.base.model.element.IModelElement;
* @author barner
* @author $Author$
* @version $Rev$
* @ConQAT.Rating GREEN Hash: 39C961D5BE3C80AC7AD20E25CC6E749E
* @ConQAT.Rating GREEN Hash: 1A28D49D8DC1FF9C00C4C1F55D5E7B8C
*/
public abstract class EStructuralFeatureValueProviderBase<T extends IAnnotatedSpecification>
extends ValueProviderBase<T> {
......@@ -118,15 +118,18 @@ public abstract class EStructuralFeatureValueProviderBase<T extends IAnnotatedSp
}
/**
* Generalizes the interface of {@link #EStructuralFeatureValueProviderBase(EClass)} with the
* following two parameters:
* Generalizes the interface of {@link #EStructuralFeatureValueProviderBase(EClass)}.
*
* @param annotatedSpecificationEClass
* {@link EClass} for which {@link EStructuralFeatureValueProviderBase} should be
* constructed.
* @param inheritedFeatures
* Flag if {@link EStructuralFeature}s that are not defined locally in
* {@code annotatedSpecificationEClass}, but that are inherited, should be included.
* @param eReferenceScope
* {@link EReferenceScope} to be offered to the user to select values for
* {@link EReference}s.
*
*/
public EStructuralFeatureValueProviderBase(EClass annotatedSpecificationEClass,
boolean inheritedFeatures, EStructuralFeatureDescriptor.EReferenceScope eReferenceScope) {
......
......@@ -39,7 +39,7 @@ import org.fortiss.tooling.base.model.element.IModelElement;
* @author diewald, barner
* @author $Author$
* @version $Rev$
* @ConQAT.Rating GREEN Hash: 429CD74E6A6BD98B0D4B2623C6747AFF
* @ConQAT.Rating GREEN Hash: 92072FF28C0A6055490A33DB8F1A062B
*/
public abstract class ValueProviderBase<T extends IAnnotatedSpecification> implements
IAnnotationValueProvider<T> {
......@@ -258,6 +258,8 @@ public abstract class ValueProviderBase<T extends IAnnotatedSpecification> imple
* {@link IAnnotatedSpecification} for which the input choice is to be updated
* @param instanceKey
* Key identifying annotation instance of {@code specification} to be used.
*
* @return Currently selected choice.
*/
protected String determineCurrentAnnotationValueAndUpdateInputChoice(String newValue,
T specification, String instanceKey) throws Exception {
......
......@@ -38,7 +38,7 @@ import org.fortiss.tooling.kernel.service.IElementCompositorService;
* @author igna
* @author $Author: hoelzl $
* @version $Rev: 18709 $
* @ConQAT.Rating GREEN Hash: 34166EC8D8CB4602E7074300461D8E36
* @ConQAT.Rating GREEN Hash: 320A37D5FAA7C2BA5DA469D0A37A8EF1
*/
abstract class ConnectionCompositorBase<HE extends IHierarchicElement, S extends EObject, T extends EObject>
implements IConnectionCompositor<HE, S, T> {
......@@ -65,7 +65,6 @@ abstract class ConnectionCompositorBase<HE extends IHierarchicElement, S extends
}
} else if(source instanceof ExitConnectorBase && target instanceof ExitConnectorBase) {
swap = source.eContainer() == target.eContainer().eContainer();
}
connection.setSource(swap ? target : source);
connection.setTarget(swap ? source : target);
......@@ -113,10 +112,16 @@ abstract class ConnectionCompositorBase<HE extends IHierarchicElement, S extends
* internally. The default value is <code>false</code>.
*
* {@link #canConnectInternally} allows to state if we support internal
* connections. By
* default connectors of the parent element cannot be connected in internal view of the element.
* connections. By default connectors of the parent element cannot be connected in internal view
* of the element.
*
* @param source
* Source object
* @param target
* Target object
*
* @return whether connectors of the component may be connected internally.
*/
@SuppressWarnings("unused")
protected boolean canConnectInternally(S source, T target) {
return false;
}
......
......@@ -38,16 +38,15 @@ import org.fortiss.tooling.kernel.service.IElementCompositorService;
* @author doebber
* @author $Author: hoelzl $
* @version $Rev: 18709 $
* @ConQAT.Rating GREEN Hash: A6465490E1A64487B6A8798496587439
* @ConQAT.Rating GREEN Hash: E298C78A1369223C7DC8400A9FE6FA51
*/
public abstract class HierarchicElementCompositorBase<HE extends IHierarchicElementContainer>
extends ModelElementCompositorBase<HE> {
/**
* Decomposition that takes care of the whole model subtree. Subclasses
* implement {@link #decompose*****()} instead.
* implement {@code #decompose*****()} instead.
*/
@SuppressWarnings("javadoc")
@Override
public final boolean decompose(EObject contained) {
return iterateDecompose(contained) && decomposeSpecific(contained);
......@@ -72,7 +71,6 @@ public abstract class HierarchicElementCompositorBase<HE extends IHierarchicElem
if(!iterateDecomposeConnectors((IHierarchicElement)contained)) {
return false;
}
}
if(contained instanceof IConnector) {
IConnector connector = (IConnector)contained;
......
......@@ -37,7 +37,7 @@ import org.fortiss.tooling.base.model.element.IModelElementSpecification;
* @author hoelzl
* @author $Author: hoelzl $
* @version $Rev: 18709 $
* @ConQAT.Rating GREEN Hash: 76BE429F0B3CC49D65F0D54E7D0BF6B2
* @ConQAT.Rating GREEN Hash: 90B5C092B1AAA88D270B48FB0B236A74
*/
public class BaseModelElementUtils {
......@@ -47,6 +47,9 @@ public class BaseModelElementUtils {
*
* @param specifications
* the list of specification to be filtered
*
* @return {@link List} of {@link IModelElementSpecification} from {@code specifications} that
* are not subclass of {@link IHiddenSpecification}.
*/
public static List<IModelElementSpecification> nonHiddenSpecifications(
Collection<IModelElementSpecification> specifications) {
......@@ -65,6 +68,9 @@ public class BaseModelElementUtils {
*
* @param element
* the hierarchic element
*
* @return Index of the given {@link IHierarchicElement} in its parent
* {@link IHierarchicElementContainer}.
*/
public static int getIndex(IHierarchicElement element) {
IHierarchicElementContainer container = element.getContainer();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment