Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
framed
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
rosi
framed
Commits
f0729d94
Commit
f0729d94
authored
7 years ago
by
Kevin Kassin
Browse files
Options
Downloads
Patches
Plain Diff
Commit 9.9 18:50
deleted unused code
parent
4fc63bfe
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/connections/FulfillmentPattern.java
+9
-8
9 additions, 8 deletions
...ramed/iorm/ui/pattern/connections/FulfillmentPattern.java
with
9 additions
and
8 deletions
org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/connections/FulfillmentPattern.java
+
9
−
8
View file @
f0729d94
...
@@ -12,8 +12,6 @@ import org.eclipse.graphiti.mm.algorithms.Text;
...
@@ -12,8 +12,6 @@ import org.eclipse.graphiti.mm.algorithms.Text;
import
org.eclipse.graphiti.mm.pictograms.Anchor
;
import
org.eclipse.graphiti.mm.pictograms.Anchor
;
import
org.eclipse.graphiti.mm.pictograms.Connection
;
import
org.eclipse.graphiti.mm.pictograms.Connection
;
import
org.eclipse.graphiti.mm.pictograms.ConnectionDecorator
;
import
org.eclipse.graphiti.mm.pictograms.ConnectionDecorator
;
import
org.eclipse.graphiti.mm.pictograms.ContainerShape
;
import
org.eclipse.graphiti.mm.pictograms.Diagram
;
import
org.eclipse.graphiti.mm.pictograms.PictogramElement
;
import
org.eclipse.graphiti.mm.pictograms.PictogramElement
;
import
org.eclipse.graphiti.util.IColorConstant
;
import
org.eclipse.graphiti.util.IColorConstant
;
import
org.framed.iorm.model.OrmFactory
;
import
org.framed.iorm.model.OrmFactory
;
...
@@ -24,7 +22,6 @@ import org.framed.iorm.ui.literals.IdentifierLiterals;
...
@@ -24,7 +22,6 @@ import org.framed.iorm.ui.literals.IdentifierLiterals;
import
org.framed.iorm.ui.literals.LayoutLiterals
;
import
org.framed.iorm.ui.literals.LayoutLiterals
;
import
org.framed.iorm.ui.literals.NameLiterals
;
import
org.framed.iorm.ui.literals.NameLiterals
;
import
org.framed.iorm.ui.util.ConnectionPatternUtil
;
import
org.framed.iorm.ui.util.ConnectionPatternUtil
;
import
org.framed.iorm.ui.util.DiagramUtil
;
import
org.framed.iorm.ui.util.GeneralUtil
;
import
org.framed.iorm.ui.util.GeneralUtil
;
import
org.framed.iorm.ui.util.PropertyUtil
;
import
org.framed.iorm.ui.util.PropertyUtil
;
...
@@ -57,6 +54,12 @@ public class FulfillmentPattern extends FRaMEDConnectionPattern {
...
@@ -57,6 +54,12 @@ public class FulfillmentPattern extends FRaMEDConnectionPattern {
*/
*/
private
static
final
String
IMG_ID_FEATURE_FULFILLMENT
=
IdentifierLiterals
.
IMG_ID_FEATURE_FULFILLMENT
;
private
static
final
String
IMG_ID_FEATURE_FULFILLMENT
=
IdentifierLiterals
.
IMG_ID_FEATURE_FULFILLMENT
;
/**
* the identifier for a diagram of a stepped in compartment view gathered from
* {@link IdentifierLiterals}
*/
private
static
final
String
DIAGRAM_KIND_COMPARTMENTTYPE_DIAGRAM
=
IdentifierLiterals
.
DIAGRAM_KIND_COMPARTMENTTYPE_DIAGRAM
;
/**
/**
* the value for the property shape id for the connection decorator of the
* the value for the property shape id for the connection decorator of the
* fulfillment
* fulfillment
...
@@ -200,7 +203,6 @@ public class FulfillmentPattern extends FRaMEDConnectionPattern {
...
@@ -200,7 +203,6 @@ public class FulfillmentPattern extends FRaMEDConnectionPattern {
org
.
framed
.
iorm
.
model
.
ModelElement
targetShape
=
ConnectionPatternUtil
.
getModelElementForAnchor
(
targetAnchor
);
org
.
framed
.
iorm
.
model
.
ModelElement
targetShape
=
ConnectionPatternUtil
.
getModelElementForAnchor
(
targetAnchor
);
if
(
sourceShape
!=
null
&&
targetShape
!=
null
)
{
if
(
sourceShape
!=
null
&&
targetShape
!=
null
)
{
if
(
sourceShape
.
getContainer
()
==
targetShape
.
getContainer
())
{
if
(
sourceShape
.
getContainer
()
==
targetShape
.
getContainer
())
{
//if (sourceShape.getType() == Type.NATURAL_TYPE || sourceShape.getType() == Type.DATA_TYPE || sourceShape.getType() == Type.COMPARTMENT_TYPE)
if
(
targetShape
.
getType
()
==
Type
.
COMPARTMENT_TYPE
)
if
(
targetShape
.
getType
()
==
Type
.
COMPARTMENT_TYPE
)
return
true
;
return
true
;
}
}
...
@@ -224,8 +226,7 @@ public class FulfillmentPattern extends FRaMEDConnectionPattern {
...
@@ -224,8 +226,7 @@ public class FulfillmentPattern extends FRaMEDConnectionPattern {
if
(
sourceShape
!=
null
)
{
if
(
sourceShape
!=
null
)
{
if
(
sourceShape
.
getType
()
==
Type
.
NATURAL_TYPE
||
sourceShape
.
getType
()
==
Type
.
DATA_TYPE
if
(
sourceShape
.
getType
()
==
Type
.
NATURAL_TYPE
||
sourceShape
.
getType
()
==
Type
.
DATA_TYPE
||
sourceShape
.
getType
()
==
Type
.
COMPARTMENT_TYPE
||
sourceShape
.
getType
()
==
Type
.
COMPARTMENT_TYPE
||
(
sourceShape
.
getType
()
==
Type
.
ROLE_TYPE
&&
PropertyUtil
.
isDiagram_KindValue
(
getDiagram
(),
||
(
sourceShape
.
getType
()
==
Type
.
ROLE_TYPE
&&
PropertyUtil
.
isDiagram_KindValue
(
getDiagram
(),
DIAGRAM_KIND_COMPARTMENTTYPE_DIAGRAM
)))
IdentifierLiterals
.
DIAGRAM_KIND_COMPARTMENTTYPE_DIAGRAM
)))
return
true
;
return
true
;
}
}
return
false
;
return
false
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment