Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
Enigma
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlfaTrainingKurse
Java
Enigma
Merge requests
!103
NullPointer behoben
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
NullPointer behoben
d.eisold/enigma:master
into
master
Overview
0
Commits
1
Pipelines
1
Changes
1
Merged
Dennis Eisold
requested to merge
d.eisold/enigma:master
into
master
5 years ago
Overview
0
Commits
1
Pipelines
1
Changes
1
Expand
👍
0
👎
0
Merge request reports
Viewing commit
cee38f95
Show latest version
1 file
+
14
−
7
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
cee38f95
NullPointer behoben
· cee38f95
Dennis Eisold
authored
5 years ago
src/main/java/projekt/enigma/GuiController.java
+
14
−
7
Options
@@ -505,16 +505,21 @@ public class GuiController {
* sowie den Klartext in das Textfeld tfKlartext. Setzt den Spruchschlüssel
*/
private
void
empfangeFunkspruch
()
{
progressDialogue
(
"rx"
);
if
(
this
.
empfangeneNachricht
[
2
]
!=
null
)
{
setzeTagesSchluessel
();
tfKlartext
.
setText
(
this
.
empfangeneNachricht
[
2
]);
tfCodiert
.
setText
(
this
.
empfangeneNachricht
[
1
]);
resetDisplay
=
true
;
try
{
if
(
this
.
empfangeneNachricht
[
2
]
!=
null
&&
this
.
empfangeneNachricht
[
1
]
!=
null
)
{
setzeTagesSchluessel
();
tfKlartext
.
setText
(
this
.
empfangeneNachricht
[
2
]);
tfCodiert
.
setText
(
this
.
empfangeneNachricht
[
1
]);
resetDisplay
=
true
;
// Spruchschluessel in das Feld lblSpruchschluessel schreiben
lblSpruchschluessel
.
setText
(
codierer
.
empfangenerSpruchschluessel
(
this
.
empfangeneNachricht
[
2
]));
// Spruchschluessel in das Feld lblSpruchschluessel schreiben
lblSpruchschluessel
.
setText
(
codierer
.
empfangenerSpruchschluessel
(
this
.
empfangeneNachricht
[
2
]));
}
}
catch
(
NullPointerException
ignored
)
{
new
Fehler
().
showErrorDialog
(
"warning"
,
"Aus dem Westen nichts neues"
,
"Keine neuen Nachrichten vorhanden"
);
}
}
@@ -523,6 +528,7 @@ public class GuiController {
* Löscht die Textfelder tfKlartext und tfCodiert
*/
private
void
sendeFunkspruch
()
{
this
.
tfKlartext
.
setText
(
""
);
this
.
tfCodiert
.
setText
(
""
);
@@ -530,6 +536,7 @@ public class GuiController {
}
private
void
progressDialogue
(
String
strRxTx
)
{
Task
copyWorker
=
createWorker
(
strRxTx
);
ProgressDialog
dialog
=
new
ProgressDialog
(
copyWorker
);
Loading