Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
vadere
vadere
Commits
0cce6570
Commit
0cce6570
authored
Sep 11, 2016
by
Benjamin Aaron Degenhart
Browse files
Change remigration menu item to remigrate and open
parent
e020cbeb
Changes
4
Hide whitespace changes
Inline
Side-by-side
VadereGui/resources/messages.properties
View file @
0cce6570
...
...
@@ -98,6 +98,7 @@ ProjectView.txtpnAttributesfile.text=attributesfile
ProjectView.mntmLanguageChoiceMenu.text
=
Set language
ProjectView.mntmEnglishLocale.text
=
English
ProjectView.mntmGermanLocale.text
=
German
ProjectView.mntmReapplyMigration.text
=
Remigrate project and open...
SaveBeforeClosing.text
=
Do you want to save the current project before closing?
SaveBeforeClosing.unsavedChanges.text
=
Unsaved changes:
...
...
VadereGui/resources/messages_de.properties
View file @
0cce6570
...
...
@@ -98,6 +98,7 @@ ProjectView.txtpnAttributesfile.text=Attributsdatei
ProjectView.mntmLanguageChoiceMenu.text
=
Sprache
\u
00E4ndern
ProjectView.mntmEnglishLocale.text
=
Englisch
ProjectView.mntmGermanLocale.text
=
Deutsch
ProjectView.mntmReapplyMigration.text
=
Projekt remigrieren und
\u
00F6ffnen...
SaveBeforeClosing.text
=
Aktuelles Projekt vor dem Beenden speichern?
SaveBeforeClosing.unsavedChanges.text
=
Ungespeicherte
\u
00c4nderungen:
...
...
VadereGui/src/org/vadere/gui/projectview/control/ActionLoadProject.java
View file @
0cce6570
...
...
@@ -31,6 +31,10 @@ public class ActionLoadProject extends AbstractAction {
@Override
public
void
actionPerformed
(
final
ActionEvent
event
)
{
loadProject
(
false
);
}
public
void
loadProject
(
boolean
isRemigrationLoading
)
{
try
{
// 1. ask for save project if it has changed
if
(!
ActionAbstractSaveProject
.
askSaveUnlessUserCancels
(
model
))
{
...
...
@@ -41,6 +45,11 @@ public class ActionLoadProject extends AbstractAction {
String
projectFilePath
=
VDialogManager
.
loadProjectDialog
();
if
(
projectFilePath
!=
null
)
{
if
(
isRemigrationLoading
)
{
MigrationAssistant
.
setReapplyLatestMigrationFlag
();
}
// 3. load project
loadProjectByPath
(
model
,
projectFilePath
);
}
else
{
...
...
VadereGui/src/org/vadere/gui/projectview/view/ProjectView.java
View file @
0cce6570
...
...
@@ -393,11 +393,10 @@ public class ProjectView extends JFrame implements ProjectFinishedListener, Sing
else
mntmEnglishLocale
.
setSelected
(
true
);
JMenuItem
mntmReapplyMigration
=
new
JMenuItem
(
new
AbstractAction
(
"Reapply latest version-m
igration
"
)
{
JMenuItem
mntmReapplyMigration
=
new
JMenuItem
(
new
AbstractAction
(
Messages
.
getString
(
"ProjectView.mntmReapplyM
igration
.text"
)
)
{
@Override
public
void
actionPerformed
(
ActionEvent
e
)
{
MigrationAssistant
.
setReapplyLatestMigrationFlag
();
ActionLoadProject
.
loadProjectByPath
(
model
,
model
.
getCurrentProjectPath
());
(
new
ActionLoadProject
(
Messages
.
getString
(
"ProjectView.mntmLoadTestProject.text"
),
model
)).
loadProject
(
true
);
}
});
mnHelp
.
add
(
mntmReapplyMigration
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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