Merge pull request #41 from lawson89/master

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

Author: gk-brown

sierra-tools/previewer/src/main/java/org/httprpc/sierra/previewer/MainFrame.java renamed to sierra-tools/previewer/src/main/java/org/httprpc/sierra/tools/previewer/MainFrame.java

@@ -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;

sierra-tools/previewer/src/main/java/org/httprpc/sierra/previewer/RecentFilesManager.java renamed to sierra-tools/previewer/src/main/java/org/httprpc/sierra/tools/previewer/RecentFilesManager.java

@@ -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;

sierra-tools/previewer/src/main/java/org/httprpc/sierra/previewer/SierraPreviewerApp.java renamed to sierra-tools/previewer/src/main/java/org/httprpc/sierra/tools/previewer/SierraPreviewerApp.java

@@ -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;
 

sierra-tools/previewer/src/main/java/org/httprpc/sierra/previewer/SierraXMLCompletionProvider.java renamed to sierra-tools/previewer/src/main/java/org/httprpc/sierra/tools/previewer/SierraXMLCompletionProvider.java

@@ -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;
@@ -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);
     }
 

sierra-tools/previewer/src/main/java/org/httprpc/sierra/previewer/engine/RenderingEngine.java renamed to sierra-tools/previewer/src/main/java/org/httprpc/sierra/tools/previewer/engine/RenderingEngine.java

@@ -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;

sierra-tools/previewer/src/main/java/org/httprpc/sierra/previewer/model/RenderError.java renamed to sierra-tools/previewer/src/main/java/org/httprpc/sierra/tools/previewer/model/RenderError.java

@@ -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

sierra-tools/previewer/src/main/java/org/httprpc/sierra/previewer/model/RenderResult.java renamed to sierra-tools/previewer/src/main/java/org/httprpc/sierra/tools/previewer/model/RenderResult.java

@@ -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;
 

sierra-tools/previewer/src/main/resources/org/httprpc/sierra/previewer/MainFrame.xml renamed to sierra-tools/previewer/src/main/resources/org/httprpc/sierra/tools/previewer/MainFrame.xml

@@ -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;