Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mihai.herda
keyjoana
Commits
18d56ada
Commit
18d56ada
authored
Oct 22, 2019
by
Joachim Müssig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specgui recompile button bug. Add RemoveBasePathPart method in FilesUtil
parent
cea89546
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
14 deletions
+18
-14
src/keyjoana/util/FilesUtil.java
src/keyjoana/util/FilesUtil.java
+5
-0
src/specgui/FXMLDocument.fxml
src/specgui/FXMLDocument.fxml
+1
-0
src/specgui/FXMLDocumentController.java
src/specgui/FXMLDocumentController.java
+12
-13
src/specgui/helper/JarCreator.java
src/specgui/helper/JarCreator.java
+0
-1
No files found.
src/keyjoana/util/FilesUtil.java
View file @
18d56ada
package
keyjoana.util
;
import
java.io.File
;
import
java.nio.file.Path
;
/**
* provides different methods to work with files
...
...
@@ -39,4 +40,8 @@ public class FilesUtil {
return
""
;
}
}
public
static
String
removeBasePathPart
(
Path
filePath
,
Path
basePath
)
{
return
basePath
.
relativize
(
filePath
).
toString
();
}
}
src/specgui/FXMLDocument.fxml
View file @
18d56ada
...
...
@@ -55,6 +55,7 @@
<menus>
<Menu
mnemonicParsing=
"false"
text=
"File"
>
<items>
<MenuItem
mnemonicParsing=
"false"
onAction=
"#onChooseSrcFolder"
text=
"Select Java Source"
/>
<Menu
fx:id=
"menuOpenRecent"
mnemonicParsing=
"false"
text=
"Recently Loaded"
/>
<MenuItem
fx:id=
"menuItemReloadSource"
mnemonicParsing=
"false"
text=
"reload Java Source"
>
<accelerator>
...
...
src/specgui/FXMLDocumentController.java
View file @
18d56ada
...
...
@@ -245,16 +245,13 @@ public class FXMLDocumentController implements Initializable {
@FXML
public
void
onPressCompile
()
{
String
mainClass
=
mainClassesCB
.
getSelectionModel
().
getSelectedItem
();
joanaView
.
preProcessAllJavaFilesInDirecotory
(
chosenFile
);
try
{
joanaView
.
setCurrentJavaFolderFile
(
chosenFile
);
tryCreateJoanaAsync
();
selectMainClass
(
mainClass
);
}
catch
(
CompilerException
e
)
{
compilationErrorMessage
(
e
.
getMessage
());
if
(
chosenFile
!=
null
)
{
this
.
loadSrcFile
(
chosenFile
);
}
else
{
//should not happen
setStatusMessage
(
"Error, reload the file"
);
setStatusMessageColor
(
Color
.
RED
);
}
}
@FXML
...
...
@@ -336,16 +333,18 @@ public class FXMLDocumentController implements Initializable {
private
void
loadSrcFile
(
File
chosenSrcDir
)
{
buttonCompile
.
setDisable
(
true
);
setStatusMessage
(
"Pre processing files ..."
);
setStatusMessageColor
(
javafx
.
scene
.
paint
.
Color
.
BLUE
);
joanaView
.
preProcessAllJavaFilesInDirecotory
(
chosenSrcDir
);
if
(
preProcessCheckBox
.
isScaleShape
())
{
setStatusMessage
(
"Pre processing files ..."
);
setStatusMessageColor
(
javafx
.
scene
.
paint
.
Color
.
BLUE
);
joanaView
.
preProcessAllJavaFilesInDirecotory
(
chosenSrcDir
);
}
setStatusMessage
(
"Generate Jar files ..."
);
setStatusMessageColor
(
javafx
.
scene
.
paint
.
Color
.
BLUE
);
try
{
joanaView
.
setCurrentJavaFolderFile
(
chosenSrcDir
);
letUserChooseMainClass
(
Helper
.
getAllClassesContainingMainMethod
(
joanaView
.
getCurrentJavaFolderFile
()));
this
.
chosenFile
=
chosenSrcDir
;
disableMainGUIElements
(
false
,
true
,
tru
e
,
false
);
disableMainGUIElements
(
false
,
true
,
fals
e
,
false
);
}
catch
(
CompilerException
e
)
{
compilationErrorMessage
(
e
.
getMessage
());
}
...
...
src/specgui/helper/JarCreator.java
View file @
18d56ada
...
...
@@ -58,7 +58,6 @@ public class JarCreator {
for
(
Diagnostic
<?
extends
JavaFileObject
>
diagnostic
:
diagnostics
)
{
// read error dertails from the diagnostic object
// compileErrorMessage.append(diagnostic.getMessage(null));
System
.
out
.
println
(
"\n"
+
diagnostic
+
"\n"
);
compileErrorMessage
.
append
(
diagnostic
.
getSource
().
getName
()+
"\nLine "
+
diagnostic
.
getLineNumber
()+
" "
+
diagnostic
.
getMessage
(
null
)+
"\n"
);
}
CompilerException
ex
=
new
CompilerException
(
compileErrorMessage
.
toString
());
...
...
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