Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
af3
AF3
Commits
ae98a721
Commit
ae98a721
authored
Jan 29, 2018
by
Simon Barner
Browse files
YELLOW
Style cleanup (no functional change) refs 2562
parent
d19cec0e
Changes
5
Hide whitespace changes
Inline
Side-by-side
org.fortiss.af3.task/trunk/src/org/fortiss/af3/task/compositor/.ratings
View file @
ae98a721
ComponentToTaskAllocationTableCollectionCompositor.java 19733b43e4684d81799557e5c70c9b708e94b554 YELLOW
TaskArchitectureFileProjectCompositor.java c70325e56c165199b676fb9cac84ed55f7a65b6c YELLOW
TaskCompositor.java fb72faa5a865ac643227419749d3fa88a9eaa39c YELLOW
TaskConnectionCompositor.java 1
3c8268671e24ed4ee192f537bffe5aa794503d3
YELLOW
TaskConnectionCompositor.java 1
029c2789dd0e72a22ec6f43eb1e9ea406f8683c
YELLOW
TaskPortCompositor.java 5a56d2990ffddd5f80c00629e5f78d73c2aac7f2 YELLOW
TaskToExecutionUnitAllocationTableCollectionCompositor.java 3d0a3f0c9ab00606444c4cecd4d75a8d1977f710 YELLOW
TaskWcetTableCompositor.java aa91d730714883a2f35beb80672141ec40a89593 YELLOW
org.fortiss.af3.task/trunk/src/org/fortiss/af3/task/compositor/TaskConnectionCompositor.java
View file @
ae98a721
...
...
@@ -64,7 +64,6 @@ public class TaskConnectionCompositor extends
Signal
connection
=
createConnection
();
prepareUniqueID
(
connection
,
parent
);
// "signals" is an unmodifiable list, hence add new signal directly to connections list
taskArchitecture
.
getConnections
().
add
(
connection
);
connection
.
setSource
((
IConnector
)
source
);
connection
.
setTarget
((
IConnector
)
target
);
...
...
@@ -74,7 +73,7 @@ public class TaskConnectionCompositor extends
/** {@inheritDoc} */
@Override
protected
Signal
createConnection
()
{
return
createSignal
();
return
createSignal
(
"Signal"
);
}
/** {@inheritDoc} */
...
...
org.fortiss.af3.task/trunk/src/org/fortiss/af3/task/util/.ratings
View file @
ae98a721
ComponentToTaskArchitectureTransformation.java
6d614be2c9e05f62eb7229ad94ae698f8a0bd7fa
YELLOW
ComponentToTaskArchitectureTransformation.java
527d754e5e3c86416d5089c98d104607d4675053
YELLOW
TaskAllocationUtils.java da58103cbd66cc6d5c47837aa9df7ee6e5d8aac0 RED
TaskArchitectureUtils.java 5d0cd2193c079e16fe56e99de36d748c5fd446ed YELLOW
TaskModelElementFactory.java
9630bfe039d21b3bdeb29c101d17d9a37876ebaf
YELLOW
TaskModelElementFactory.java
8b925d64b800555a91885b18dc4291ca7e038d7a
YELLOW
org.fortiss.af3.task/trunk/src/org/fortiss/af3/task/util/ComponentToTaskArchitectureTransformation.java
View file @
ae98a721
...
...
@@ -33,7 +33,6 @@ import org.fortiss.af3.task.model.Task;
import
org.fortiss.af3.task.model.TaskArchitecture
;
import
org.fortiss.af3.task.model.TaskInputPort
;
import
org.fortiss.af3.task.model.TaskOutputPort
;
import
org.fortiss.af3.task.model.TaskSamplingOutputPort
;
import
org.fortiss.af3.task.model.allocation.ComponentToTaskAllocationEntry
;
import
org.fortiss.af3.task.model.allocation.ComponentToTaskAllocationTable
;
import
org.fortiss.af3.task.model.allocation.InputPortToTaskInputPortAllocationEntry
;
...
...
@@ -58,10 +57,8 @@ public class ComponentToTaskArchitectureTransformation
/** {@inheritDoc} */
@Override
protected
TaskArchitecture
createArchitecture
(
Component
component
)
{
TaskArchitecture
taskArchitecture
=
createTaskArchitecture
(
"Task Architecture (generated for: "
+
component
.
getName
()
+
")"
);
return
taskArchitecture
;
return
createTaskArchitecture
(
"Task Architecture (generated for: "
+
component
.
getName
()
+
")"
);
}
/** {@inheritDoc} */
...
...
@@ -69,10 +66,8 @@ public class ComponentToTaskArchitectureTransformation
protected
ComponentToTaskAllocationTable
createAllocationTable
(
TaskArchitecture
taskArchitecture
,
ComponentArchitecture
componentArchitecture
,
AllocationTableCollection
atc
)
{
ComponentToTaskAllocationTable
ca2ta
=
createComponentToTaskAllocationTable
(
componentArchitecture
.
getTopComponent
()
.
getName
()
+
LEFT_ARROW
+
taskArchitecture
.
getName
());
return
ca2ta
;
return
createComponentToTaskAllocationTable
(
componentArchitecture
.
getTopComponent
()
.
getName
()
+
LEFT_ARROW
+
taskArchitecture
.
getName
());
}
/** {@inheritDoc} */
...
...
@@ -84,8 +79,7 @@ public class ComponentToTaskArchitectureTransformation
/** {@inheritDoc} */
@Override
protected
TaskOutputPort
createOutputPort
(
OutputPort
outputPort
)
{
TaskSamplingOutputPort
taskOutputPort
=
createTaskSamplingOutputPort
(
outputPort
.
getName
());
return
taskOutputPort
;
return
createTaskSamplingOutputPort
(
outputPort
.
getName
());
}
/** {@inheritDoc} */
...
...
@@ -99,8 +93,7 @@ public class ComponentToTaskArchitectureTransformation
protected
Signal
createConnection
(
TaskOutputPort
taskOutputPort
,
TaskInputPort
taskInputPort
)
{
String
signalName
=
"Signal "
+
taskOutputPort
.
getName
()
+
LEFT_ARROW
+
taskInputPort
.
getName
();
Signal
signal
=
createSignal
(
taskOutputPort
,
taskInputPort
,
signalName
);
return
signal
;
return
createSignal
(
taskOutputPort
,
taskInputPort
,
signalName
);
}
/** {@inheritDoc} */
...
...
org.fortiss.af3.task/trunk/src/org/fortiss/af3/task/util/TaskModelElementFactory.java
View file @
ae98a721
...
...
@@ -24,6 +24,7 @@ import org.fortiss.af3.task.model.TaskArchitecture;
import
org.fortiss.af3.task.model.TaskInputPort
;
import
org.fortiss.af3.task.model.TaskModelFactory
;
import
org.fortiss.af3.task.model.TaskOutputPort
;
import
org.fortiss.af3.task.model.TaskPort
;
import
org.fortiss.af3.task.model.TaskQueuingInputPort
;
import
org.fortiss.af3.task.model.TaskQueuingOutputPort
;
import
org.fortiss.af3.task.model.TaskSamplingInputPort
;
...
...
@@ -32,7 +33,6 @@ import org.fortiss.af3.task.model.allocation.ComponentToTaskAllocationTable;
import
org.fortiss.af3.task.model.allocation.TaskAllocationFactory
;
import
org.fortiss.af3.task.model.allocation.TaskToExecutionUnitAllocationTable
;
import
org.fortiss.af3.task.model.allocation.TaskWcetTable
;
import
org.fortiss.tooling.base.utils.LayoutModelElementFactory
;
/**
* Model Element Factory for {@link TaskArchitecture}
...
...
@@ -48,21 +48,20 @@ public class TaskModelElementFactory {
return
task
;
}
/** Returns a {@link Signal}. */
public
static
Signal
createSignal
()
{
/** Returns a {@link Signal}
with the given {@code name}
. */
public
static
Signal
createSignal
(
String
name
)
{
Signal
signal
=
TaskModelFactory
.
eINSTANCE
.
createSignal
();
LayoutModelElementFactory
.
createConnectionLayout
(
signal
);
signal
.
setName
(
name
);
createConnectionLayout
(
signal
);
return
signal
;
}
/** Returns a {@link Signal}. */
/** Returns a {@link Signal}
that links the given {@link TaskPort}s
. */
public
static
Signal
createSignal
(
TaskOutputPort
taskOutputPort
,
TaskInputPort
taskInputPort
,
String
name
)
{
Signal
signal
=
TaskModelFactory
.
eINSTANCE
.
createSignal
();
Signal
signal
=
createSignal
(
name
);
signal
.
setSource
(
taskOutputPort
);
signal
.
setTarget
(
taskInputPort
);
createConnectionLayout
(
signal
);
signal
.
setName
(
name
);
return
signal
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment