-
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/0.2.0' into master
- Loading branch information
Showing
34 changed files
with
716 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,3 +43,4 @@ Desktop.ini | |
| .DS_Store | ||
| /tools/ | ||
| /BuildArtifacts/ | ||
| .history/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,3 +9,5 @@ formatting: | |
| style: | ||
| ReturnCount: | ||
| max: 10 | ||
| LoopWithTooManyJumpStatements: | ||
| maxJumpCount: 5 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
rider/src/main/java/net/cakebuild/settings/CakeSearchPathSettingsEditor.form
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="net.cakebuild.settings.CakeSearchPathSettingsEditor"> | ||
| <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> | ||
| <margin top="0" left="0" bottom="0" right="0"/> | ||
| <constraints> | ||
| <xy x="20" y="20" width="500" height="400"/> | ||
| </constraints> | ||
| <properties/> | ||
| <border type="none"/> | ||
| <children> | ||
| <grid id="59657" layout-manager="BorderLayout" hgap="0" vgap="0"> | ||
| <constraints> | ||
| <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> | ||
| </constraints> | ||
| <properties/> | ||
| <border type="none"/> | ||
| <children> | ||
| <component id="f01f4" class="javax.swing.JLabel"> | ||
| <constraints border-constraint="North"/> | ||
| <properties> | ||
| <text value="Search paths"/> | ||
| </properties> | ||
| </component> | ||
| <grid id="b465e" binding="searchPathsPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> | ||
| <margin top="0" left="0" bottom="0" right="0"/> | ||
| <constraints border-constraint="Center"/> | ||
| <properties/> | ||
| <border type="none"/> | ||
| <children/> | ||
| </grid> | ||
| </children> | ||
| </grid> | ||
| <grid id="adaa6" layout-manager="BorderLayout" hgap="0" vgap="0"> | ||
| <constraints> | ||
| <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> | ||
| </constraints> | ||
| <properties/> | ||
| <border type="none"/> | ||
| <children> | ||
| <component id="333f8" class="javax.swing.JLabel"> | ||
| <constraints border-constraint="North"/> | ||
| <properties> | ||
| <text value="Exclude expressions"/> | ||
| </properties> | ||
| </component> | ||
| <grid id="9dd86" binding="excludesPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> | ||
| <margin top="0" left="0" bottom="0" right="0"/> | ||
| <constraints border-constraint="Center"/> | ||
| <properties/> | ||
| <border type="none"/> | ||
| <children/> | ||
| </grid> | ||
| </children> | ||
| </grid> | ||
| </children> | ||
| </grid> | ||
| </form> |
46 changes: 46 additions & 0 deletions
46
rider/src/main/java/net/cakebuild/settings/CakeSearchPathSettingsEditor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| package net.cakebuild.settings; | ||
|
|
||
| import net.cakebuild.settings.controls.SimpleAddEditControl; | ||
| import net.cakebuild.shared.ui.RegexCellEditor; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import javax.swing.*; | ||
| import java.util.Collection; | ||
|
|
||
| public class CakeSearchPathSettingsEditor { | ||
| private JPanel content; | ||
| private JPanel searchPathsPanel; | ||
| private JPanel excludesPanel; | ||
| private SimpleAddEditControl mySearchPathsPanel; | ||
| private SimpleAddEditControl myExcludesPanel; | ||
|
|
||
| public JPanel getContent() { return content; } | ||
|
|
||
| public void setScriptSearchPaths(@NotNull Collection<String> paths){ | ||
| mySearchPathsPanel.setData(paths); | ||
| } | ||
|
|
||
| public Collection<String> getScriptSearchPaths() { | ||
| return mySearchPathsPanel.getData(); | ||
| } | ||
|
|
||
| public void setScriptSearchIgnores(@NotNull Collection<String> expressions) { | ||
| myExcludesPanel.setData(expressions); | ||
| } | ||
|
|
||
| public Collection<String> getScriptSearchIgnores() { | ||
| return myExcludesPanel.getData(); | ||
| } | ||
|
|
||
| private void createUIComponents() { | ||
| mySearchPathsPanel = new SimpleAddEditControl(new String[] { "Path" }, () -> new String[] { "" } ); | ||
| searchPathsPanel = mySearchPathsPanel.getContent(); | ||
|
|
||
| myExcludesPanel = new SimpleAddEditControl(new String[] { "Exclude Regex" }, () -> new String[] { "" }); | ||
| excludesPanel = myExcludesPanel.getContent(); | ||
| RegexCellEditor regexCellEditor = new RegexCellEditor(); | ||
| regexCellEditor.setOnValidationError(s -> { myExcludesPanel.setValidationError(s); return null; }); | ||
| regexCellEditor.setOnValidationSuccess(() -> { myExcludesPanel.setValidationError(null); return null; }); | ||
| myExcludesPanel.setCellEditor(0, regexCellEditor); | ||
| } | ||
| } |
Oops, something went wrong.