GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-15 10:07:26 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Merge pull request #1712 from DSheirer/968-alias-editor-clear-overlap-state

Browse Source 
#968 Playlist Alias Editor - Clear Overlap Error Warning Once Resolved
This commit is contained in:
Denny Sheirer
2023-11-09 04:15:17 -05:00
committed by GitHub
parent 09e19e1486 8845306b4a
commit 7302e2806d
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/github/dsheirer/gui/playlist/alias/AliasConfigurationEditor.java
View File

@@ -387,7 +387,7 @@ public class AliasConfigurationEditor extends SplitPane
idsColumn.setCellValueFactory(new IdentifierCountCell()); idsColumn.setCellValueFactory(new IdentifierCountCell());
TableColumn<Alias, Boolean> errorsColumn = new TableColumn<>("Error"); TableColumn<Alias, Boolean> errorsColumn = new TableColumn<>("Error");
errorsColumn.setPrefWidth(80); errorsColumn.setPrefWidth(120);
errorsColumn.setCellValueFactory(new PropertyValueFactory<>("overlap")); errorsColumn.setCellValueFactory(new PropertyValueFactory<>("overlap"));
errorsColumn.setCellFactory(param -> errorsColumn.setCellFactory(param ->
{ {

5
src/main/java/io/github/dsheirer/gui/playlist/alias/AliasItemEditor.java
View File

@@ -362,7 +362,10 @@ public class AliasItemEditor extends Editor<Alias>
for(AliasID aliasID: getIdentifiersList().getItems()) for(AliasID aliasID: getIdentifiersList().getItems())
{ {
//Create a copy of the identifier so that the alias and the editor don't have the same instance //Create a copy of the identifier so that the alias and the editor don't have the same instance
alias.addAliasID(AliasFactory.copyOf(aliasID)); //and reset the overlap flag (if set) so that the alias list can reevaluate the overlap state.
AliasID copy = AliasFactory.copyOf(aliasID);
copy.setOverlap(false);
alias.addAliasID(copy);
} }
//Remove and replace alias actions //Remove and replace alias actions

2
src/main/java/io/github/dsheirer/source/tuner/rtl/r8x/r828d/R828DEmbeddedTuner.java
View File

@@ -123,7 +123,7 @@ public class R828DEmbeddedTuner extends R8xEmbeddedTuner
} }
catch(UsbException e) catch(UsbException e)
{ {
throw new SourceException("R820TTunerController - exception while setting frequency [" + frequency + "] - " + throw new SourceException("R828DTunerController - exception while setting frequency [" + frequency + "] - " +
e.getLocalizedMessage()); e.getLocalizedMessage());
} }
finally finally