Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
740e5d5
Improving coverage of inverseMerge in PropertiesMerger
stphschne Sep 23, 2026
ec59223
2455: Spotless...
stphschne Sep 30, 2026
1f2ad5b
Merge branch 'main' into fix-2455
stphschne Sep 30, 2026
971bfed
2455: Created new class for tests of PropertiesMerger. Improving cove…
stphschne Sep 30, 2026
cd023f8
Fix formatting: Spotless...
stphschne Sep 30, 2026
224074a
Merge branch 'main' into fix-2455
hohwille Oct 1, 2026
da4ee61
Merge branch 'main' into fix-2455
stphschne Oct 2, 2026
a5fb2f3
2455: Created new class for tests of PropertiesMerger. Improving cove…
stphschne Oct 6, 2026
af6cbe8
2455: Fixing the main.prefs-files in the setup- and update-folders.
stphschne Oct 6, 2026
afb2315
2455: Fixing the main.prefs-files in the setup- and update-folders.
stphschne Oct 6, 2026
2e3baf6
2455: Checkstyle fix
stphschne Oct 6, 2026
ca07553
Merge branch 'main' into fix-2455
stphschne Oct 6, 2026
cc2c4f1
2482: Creating css-classes: console.css, consoleController.css, MainW…
stphschne Oct 6, 2026
a5759b6
Merge branch 'main' into fix-2455
stphschne Oct 6, 2026
4c82ecb
Fixing testConflictResolution and update/main.prefs
stphschne Oct 7, 2026
fd69bf7
Merge remote-tracking branch 'origin/fix-2455' into fix-2455
stphschne Oct 7, 2026
df55ded
Merge branch 'main' into fix-2482
stphschne Oct 8, 2026
7d833a2
Merge branch 'main' into fix-2482
stphschne Oct 8, 2026
de87dfc
Merge remote-tracking branch 'fork/fix-2482' into 2482-Improve-CSS-St…
stphschne Oct 19, 2026
caa7b7e
Merge branch 'main' into 2482-Improve-CSS-Styling
stphschne Oct 19, 2026
58cceec
Merge branch 'main' into 2482-Improve-CSS-Styling
stphschne Oct 20, 2026
1fb51c6
Merge branch 'devonfw:main' into 2482-Improve-CSS-Styling
stphschne Oct 22, 2026
616a4b3
Merge branch 'devonfw:main' into 2482-Improve-CSS-Styling
stphschne Oct 22, 2026
e3d07e5
Merge branch 'devonfw:main' into 2482-Improve-CSS-Styling
stphschne Oct 23, 2026
3107b6d
#2482: Deleted consoleController.css
stphschne Oct 23, 2026
4cb9494
Spotless...
stphschne Oct 16, 2026
2189f99
2268:Remove check-at-attribution.sh(different issue)
stphschne Oct 22, 2026
2b99bba
Merge branch 'main' into 2482-Improve-CSS-Styling
stphschne Oct 23, 2026
2c7c703
Merge branch 'main' into 2482-Improve-CSS-Styling
stphschne Oct 26, 2026
df56167
Merge branch 'main' into 2482-Improve-CSS-Styling
stphschne Oct 26, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class DirectoryMergerTest extends AbstractIdeContextTest {
* @param workspaceDir the temporary folder to use as workspace for this test.
* @throws Exception on error.
*/

@Test
void testConfigurator(@TempDir Path workspaceDir) throws Exception {

Expand Down Expand Up @@ -124,6 +125,7 @@ void testConfigurator(@TempDir Path workspaceDir) throws Exception {
assertThat(namePath).hasContent("project - main\ntest");
}


private static class Prop implements Entry<String, String> {

private final String key;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,11 @@ private void bindStatusBar() {
private void applyStatusLabelStyle(boolean clickable) {

if (clickable) {
this.statusLabel.setStyle(
"-fx-text-fill: blue;"
+ "-fx-cursor: hand"
);
this.statusLabel.getStyleClass().add("status-label");
} else {
this.statusLabel.setStyle("");
this.statusLabel.getStyleClass().add("");
}
}


}
Comment thread
stphschne marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.status-label{
"-fx-text-fill: blue;"
+ "-fx-cursor: hand"
}
Comment thread
stphschne marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
.console-root {
-fx-background-color: white;
-fx-border-color: #cccccc;
-fx-border-width: 1px;
}
.VBox-style {
-fx-border-color: #cccccc;
-fx-border-width: 1 0 0 0;
}
.center-left {
-fx-padding: 5;
}
.console-title{
-fx-font-weight: bold;
-fx-font-size: 12;
}
.vertical-separator{
-fx-padding: 0;
}
.clear-button{
-fx-font-size: 11;
}
.checkbox{
-fx-font-size: 11;
}
.console-list-view{
-fx-font-family: 'Consolas', 'monospace';
-fx-font-size: 11;
-fx-control-inner-background: #f5f5f5;
}
.status-hbox{
-fx-padding: 3;
-fx-border-color: #e0e0e0;
-fx-border-width: 1 0 0 0;
}

.console-status-label{
-fx-font-size: 10;
-fx-text-fill: #666666;
}
.line-count-label{
-fx-font-size: 10;
-fx-text-fill: #666666;
}
Loading