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
2ef47f57
Commit
2ef47f57
authored
Jul 01, 2013
by
Johannes Eder
Browse files
adapted mira external references
refs 1007
parent
3191d59c
Changes
9
Hide whitespace changes
Inline
Side-by-side
org.fortiss.af3.mira.ui/trunk/src/org/fortiss/af3/mira/ui/action/ExportImagesAction.java
View file @
2ef47f57
...
...
@@ -86,7 +86,7 @@ public class ExportImagesAction extends EObjectActionBase<EObject> {
for
(
ImageItem
imageItem
:
element
.
getImages
())
{
try
{
copyFile
(
getImageFile
(
imageItem
),
new
File
(
imageFolder
,
imageItem
.
get
Path
()));
copyFile
(
getImageFile
(
imageItem
),
new
File
(
imageFolder
,
imageItem
.
get
Uri
()));
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
...
...
org.fortiss.af3.mira.ui/trunk/src/org/fortiss/af3/mira/ui/editor/images/ImageBox.java
View file @
2ef47f57
...
...
@@ -156,7 +156,7 @@ public class ImageBox {
// clicks on the picture
getDesktop
().
open
(
new
File
(
new
File
(
getDefaultGeneralProjectPath
(),
"images"
),
imageItem
.
get
Path
()));
.
get
Uri
()));
}
catch
(
IOException
e1
)
{
e1
.
printStackTrace
();
}
...
...
org.fortiss.af3.mira.ui/trunk/src/org/fortiss/af3/mira/ui/editor/images/ImageSection.java
View file @
2ef47f57
...
...
@@ -181,7 +181,7 @@ public class ImageSection {
return
;
}
newItem
.
set
Path
(
destFile
.
getName
());
newItem
.
set
Uri
(
destFile
.
getName
());
ICommandStackService
.
INSTANCE
.
runAsCommand
(
editedObject
,
new
Runnable
()
{
@Override
...
...
@@ -212,7 +212,7 @@ public class ImageSection {
composite
.
getShell
(),
"Image could not be opened"
,
"The image "
+
item
.
get
Path
()
+
item
.
get
Uri
()
+
" could not be opened. Perhaps it was deleted or the AF3 image folder is not accessible.\n"
+
"Do you want to delete the reference to this image?"
);
}
...
...
org.fortiss.af3.mira.ui/trunk/src/org/fortiss/af3/mira/ui/editor/requirementSource/FilePart.java
View file @
2ef47f57
...
...
@@ -133,7 +133,7 @@ public class FilePart {
this
.
document
=
document
;
this
.
isLocal
=
isLocal
;
this
.
dbc
=
dbc
;
this
.
file
=
new
File
(
fileItem
.
getUr
l
());
this
.
file
=
new
File
(
fileItem
.
getUr
i
());
this
.
form
=
form
;
this
.
registeredSourceViewers
=
registeredSourceViewers
;
}
...
...
@@ -164,7 +164,7 @@ public class FilePart {
final
Hyperlink
link
=
toolkit
.
createHyperlink
(
fileComposite
,
fileItem
.
isIsLocal
()
?
getDefaultGeneralProjectName
()
+
"/Document/"
+
fileItem
.
getName
()
:
fileItem
.
getUr
l
(),
SWT
.
NONE
);
:
fileItem
.
getUr
i
(),
SWT
.
NONE
);
singleLineInputFactory
.
applyTo
(
link
);
link
.
addMouseListener
(
new
MouseAdapter
()
{
...
...
@@ -180,7 +180,7 @@ public class FilePart {
getDesktop
().
open
(
file
);
}
}
else
{
Desktop
.
getDesktop
().
browse
(
java
.
net
.
URI
.
create
(
fileItem
.
getUr
l
()));
Desktop
.
getDesktop
().
browse
(
java
.
net
.
URI
.
create
(
fileItem
.
getUr
i
()));
}
}
catch
(
IOException
e1
)
{
if
(
askIfDelete
(
fileItem
))
...
...
@@ -215,12 +215,12 @@ public class FilePart {
if
(
isLocal
)
{
final
File
newFile
=
selectLocalFile
(
fileComposite
);
if
(
newFile
!=
null
&&
!
fileItem
.
getUr
l
().
equals
(
newFile
.
getPath
()))
{
if
(
newFile
!=
null
&&
!
fileItem
.
getUr
i
().
equals
(
newFile
.
getPath
()))
{
ICommandStackService
.
INSTANCE
.
runAsCommand
(
fileItem
,
new
Runnable
()
{
@Override
public
void
run
()
{
fileItem
.
setName
(
newFile
.
getName
());
fileItem
.
setUr
l
(
newFile
.
getPath
());
fileItem
.
setUr
i
(
newFile
.
getPath
());
fileItem
.
setDescription
(
""
);
fileItem
.
setVersion
(
""
);
...
...
@@ -241,7 +241,7 @@ public class FilePart {
@Override
public
void
run
()
{
fileItem
.
setName
(
newUrl
.
toString
());
fileItem
.
setUr
l
(
newUrl
.
toString
());
fileItem
.
setUr
i
(
newUrl
.
toString
());
fileItem
.
setDescription
(
""
);
fileItem
.
setVersion
(
""
);
}
...
...
@@ -250,7 +250,7 @@ public class FilePart {
}
}
link
.
setText
(
fileItem
.
isIsLocal
()
?
getDefaultGeneralProjectName
()
+
"/Document/"
+
fileItem
.
getName
()
:
fileItem
.
getUr
l
());
fileItem
.
getName
()
:
fileItem
.
getUr
i
());
fileComposite
.
layout
(
true
);
fileComposite
.
redraw
();
composite
.
layout
();
...
...
@@ -351,7 +351,7 @@ public class FilePart {
return
openQuestion
(
composite
.
getShell
(),
"Illegal file"
,
"The file "
+
(
item
.
isIsLocal
()
?
getDefaultGeneralProjectName
()
+
"/Document/"
+
fileItem
.
getName
()
:
item
.
getUr
l
())
+
" could not be found.\n"
+
fileItem
.
getName
()
:
item
.
getUr
i
())
+
" could not be found.\n"
+
"Do you want to delete the reference to this file?"
);
}
...
...
org.fortiss.af3.mira.ui/trunk/src/org/fortiss/af3/mira/ui/utils/ImageUtils.java
View file @
2ef47f57
...
...
@@ -146,6 +146,6 @@ public class ImageUtils {
*/
public
static
File
getImageFile
(
ImageItem
item
)
{
File
f1
=
new
File
(
getDefaultGeneralProjectPath
(),
"images"
);
return
new
File
(
f1
,
item
.
get
Path
());
return
new
File
(
f1
,
item
.
get
Uri
());
}
}
org.fortiss.af3.mira/trunk/model/mira.ecore
View file @
2ef47f57
...
...
@@ -114,9 +114,7 @@
</eAnnotations>
</eOperations>
</eClassifiers>
<eClassifiers
xsi:type=
"ecore:EClass"
name=
"ImageItem"
eSuperTypes=
"platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement"
>
<eStructuralFeatures
xsi:type=
"ecore:EAttribute"
name=
"path"
eType=
"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
/>
</eClassifiers>
<eClassifiers
xsi:type=
"ecore:EClass"
name=
"ImageItem"
eSuperTypes=
"platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//IExternalDocumentReference"
/>
<eClassifiers
xsi:type=
"ecore:EClass"
name=
"IImageContainer"
>
<eStructuralFeatures
xsi:type=
"ecore:EReference"
name=
"images"
upperBound=
"-1"
eType=
"#//ImageItem"
containment=
"true"
/>
...
...
@@ -490,8 +488,7 @@
<eStructuralFeatures
xsi:type=
"ecore:EAttribute"
name=
"mobileNr"
eType=
"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
/>
</eClassifiers>
<eClassifiers
xsi:type=
"ecore:EClass"
name=
"ExternalSystem"
eSuperTypes=
"#//requirementSource/RequirementSourceElement"
/>
<eClassifiers
xsi:type=
"ecore:EClass"
name=
"FileItem"
eSuperTypes=
"platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//element/IHierarchicElement platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement"
>
<eStructuralFeatures
xsi:type=
"ecore:EAttribute"
name=
"url"
eType=
"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
/>
<eClassifiers
xsi:type=
"ecore:EClass"
name=
"FileItem"
eSuperTypes=
"platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//element/IHierarchicElement platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//IExternalDocumentReference"
>
<eStructuralFeatures
xsi:type=
"ecore:EAttribute"
name=
"version"
eType=
"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
/>
<eStructuralFeatures
xsi:type=
"ecore:EAttribute"
name=
"isLocal"
eType=
"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
/>
<eStructuralFeatures
xsi:type=
"ecore:EAttribute"
name=
"description"
eType=
"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
/>
...
...
org.fortiss.af3.mira/trunk/model/mira.genmodel
View file @
2ef47f57
...
...
@@ -58,9 +58,7 @@
<genClasses
ecoreClass=
"mira.ecore#//RequirementSpecification"
>
<genOperations
ecoreOperation=
"mira.ecore#//RequirementSpecification/getRequirement"
/>
</genClasses>
<genClasses
ecoreClass=
"mira.ecore#//ImageItem"
>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute mira.ecore#//ImageItem/path"
/>
</genClasses>
<genClasses
ecoreClass=
"mira.ecore#//ImageItem"
/>
<genClasses
ecoreClass=
"mira.ecore#//IImageContainer"
>
<genFeatures
property=
"None"
children=
"true"
createChild=
"true"
ecoreFeature=
"ecore:EReference mira.ecore#//IImageContainer/images"
/>
</genClasses>
...
...
@@ -240,7 +238,6 @@
</genClasses>
<genClasses
ecoreClass=
"mira.ecore#//requirementSource/ExternalSystem"
/>
<genClasses
ecoreClass=
"mira.ecore#//requirementSource/FileItem"
>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute mira.ecore#//requirementSource/FileItem/url"
/>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute mira.ecore#//requirementSource/FileItem/version"
/>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute mira.ecore#//requirementSource/FileItem/isLocal"
/>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute mira.ecore#//requirementSource/FileItem/description"
/>
...
...
org.fortiss.af3.mira/trunk/src/org/fortiss/af3/mira/report/ContextFactory.java
View file @
2ef47f57
...
...
@@ -593,7 +593,7 @@ public class ContextFactory {
public
static
EvaluationContext
getContextFor
(
ImageItem
imageItem
)
{
EvaluationContext
ctx
=
new
EvaluationContext
();
ctx
.
set
(
"description"
,
imageItem
.
getName
());
ctx
.
set
(
"path"
,
imageItem
.
get
Path
());
ctx
.
set
(
"path"
,
imageItem
.
get
Uri
());
return
ctx
;
}
...
...
@@ -692,7 +692,7 @@ public class ContextFactory {
EvaluationContext
ctx
=
new
EvaluationContext
();
ctx
.
set
(
"type"
,
fileItem
.
isIsLocal
()
?
"Local file"
:
"File link"
);
ctx
.
set
(
"is_Local"
,
fileItem
.
isIsLocal
());
ctx
.
set
(
"fileUrl"
,
fileItem
.
getUr
l
());
ctx
.
set
(
"fileUrl"
,
fileItem
.
getUr
i
());
ctx
.
set
(
"fileName"
,
fileItem
.
getName
());
ctx
.
set
(
"fileDescription"
,
fileItem
.
getDescription
());
ctx
.
set
(
"fileVersion"
,
fileItem
.
getVersion
());
...
...
org.fortiss.af3.mira/trunk/src/org/fortiss/af3/mira/utils/MiraModelElementFactory.java
View file @
2ef47f57
...
...
@@ -462,7 +462,7 @@ public final class MiraModelElementFactory {
/** Creates a {@link FileItem} */
public
static
FileItem
createFileItem
(
String
url
,
String
name
,
boolean
isLocal
)
{
FileItem
file
=
RequirementSourceFactory
.
eINSTANCE
.
createFileItem
();
file
.
setUr
l
(
url
);
file
.
setUr
i
(
url
);
file
.
setName
(
name
);
file
.
setIsLocal
(
isLocal
);
file
.
setDescription
(
""
);
...
...
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