Skip to content

Migrate to org.httprpc.sierra.tools and pull common attributes from UILoader #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 17, 2025
Merged

Migrate to org.httprpc.sierra.tools and pull common attributes from UILoader #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e83a662
Migrate to org.httprpc.sierra.tools
lawson89 Nov 17, 2025
bb20b54
Merge branch 'master' of github.com:lawson89/Sierra
lawson89 Nov 17, 2025
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
8 changes: 4 additions & 4 deletions ...g/httprpc/sierra/previewer/MainFrame.java → ...rpc/sierra/tools/previewer/MainFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.httprpc.sierra.previewer;
package org.httprpc.sierra.tools.previewer;

import org.fife.ui.autocomplete.AutoCompletion;
import org.fife.ui.autocomplete.CompletionProvider;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
import org.httprpc.sierra.Outlet;
import org.httprpc.sierra.UILoader;
import org.httprpc.sierra.previewer.engine.RenderingEngine;
import org.httprpc.sierra.previewer.model.RenderError;
import org.httprpc.sierra.previewer.model.RenderResult;
import org.httprpc.sierra.tools.previewer.engine.RenderingEngine;
import org.httprpc.sierra.tools.previewer.model.RenderError;
import org.httprpc.sierra.tools.previewer.model.RenderResult;

import javax.swing.ImageIcon;
import javax.swing.JFileChooser;
Expand Down
2 changes: 1 addition & 1 deletion .../sierra/previewer/RecentFilesManager.java → ...a/tools/previewer/RecentFilesManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.httprpc.sierra.previewer;
package org.httprpc.sierra.tools.previewer;

import java.nio.file.Path;
import java.nio.file.Paths;
Expand Down
2 changes: 1 addition & 1 deletion .../sierra/previewer/SierraPreviewerApp.java → ...a/tools/previewer/SierraPreviewerApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.httprpc.sierra.previewer;
package org.httprpc.sierra.tools.previewer;

import com.formdev.flatlaf.FlatLightLaf;

Expand Down
17 changes: 5 additions & 12 deletions ...reviewer/SierraXMLCompletionProvider.java → ...reviewer/SierraXMLCompletionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.httprpc.sierra.previewer;
package org.httprpc.sierra.tools.previewer;

import org.fife.ui.autocomplete.BasicCompletion;
import org.fife.ui.autocomplete.Completion;
Expand Down Expand Up @@ -73,17 +73,10 @@ private void loadTags() {

private void addCommonAttributes() {
Map<String, String> attributes = new HashMap<>();
// Add common attributes applicable to all components
attributes.put("name", "String");
attributes.put("group", "String");
attributes.put("border", "String");
attributes.put("padding", "String");
attributes.put("weight", "String");
attributes.put("size", "String");
attributes.put("tabTitle", "String");
attributes.put("tabIcon", "String");
attributes.put("style", "String");
attributes.put("styleClass", "String");
// Add common attributes from UILoader.Attribute enum
for (UILoader.Attribute attr : UILoader.Attribute.values()) {
attributes.put(attr.getName(), attr.getType().getSimpleName());
}
baseClassAttributeDefinitions.put("CommonAttributes", attributes);
}

Expand Down
6 changes: 3 additions & 3 deletions ...rra/previewer/engine/RenderingEngine.java → ...ols/previewer/engine/RenderingEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.httprpc.sierra.previewer.engine;
package org.httprpc.sierra.tools.previewer.engine;

import org.httprpc.sierra.UILoader;
import org.httprpc.sierra.previewer.model.RenderError;
import org.httprpc.sierra.previewer.model.RenderResult;
import org.httprpc.sierra.tools.previewer.model.RenderError;
import org.httprpc.sierra.tools.previewer.model.RenderResult;

import javax.swing.JPanel;
import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion ...c/sierra/previewer/model/RenderError.java → ...ra/tools/previewer/model/RenderError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.httprpc.sierra.previewer.model;
package org.httprpc.sierra.tools.previewer.model;

/**
* A record to hold detailed information about a rendering failure. Implements
Expand Down
2 changes: 1 addition & 1 deletion .../sierra/previewer/model/RenderResult.java → ...a/tools/previewer/model/RenderResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.httprpc.sierra.previewer.model;
package org.httprpc.sierra.tools.previewer.model;

import javax.swing.JComponent;

Expand Down
0 ...rg/httprpc/sierra/previewer/MainFrame.xml → ...prpc/sierra/tools/previewer/MainFrame.xml
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...previewer/src/test/java/org/httprpc/sierra/previewer/SierraXMLCompletionProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package org.httprpc.sierra.previewer;

import org.fife.ui.autocomplete.Completion;
import org.httprpc.sierra.tools.previewer.SierraXMLCompletionProvider;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

Expand Down