Skip to content
Snippets Groups Projects
Commit 0124e3d1 authored by William Holmgren's avatar William Holmgren
Browse files

Some changes

parent 6849c968
No related branches found
No related tags found
No related merge requests found
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/classes" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/Task_B.iml" filepath="$PROJECT_DIR$/Task_B.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>
\ No newline at end of file
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="EclipseModuleManager">
<libelement value="jar://$MODULE_DIR$/lib/yamlbeans-1.0.jar!/" />
<src_description expected_position="0">
<src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
<src_folder value="file://$MODULE_DIR$/test/src" expected_position="1" />
</src_description>
</component>
<component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/bin" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test/src" isTestSource="false" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" />
<orderEntry type="module-library">
<library name="yamlbeans-1.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/yamlbeans-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="junit4">
<CLASSES>
<root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>
\ No newline at end of file
...@@ -9,10 +9,10 @@ public class MyBuildConfigReaderFactory implements IBuildConfigReaderFactory { ...@@ -9,10 +9,10 @@ public class MyBuildConfigReaderFactory implements IBuildConfigReaderFactory {
public IBuildConfigReader createBuildConfigReader(String buildFileName) { public IBuildConfigReader createBuildConfigReader(String buildFileName) {
String fileNameExtension = buildFileName.substring(buildFileName.lastIndexOf(".")); String fileNameExtension = buildFileName.substring(buildFileName.lastIndexOf("."));
if (fileNameExtension.equals(".yaml")) { if (fileNameExtension.equals(".yaml")) {
return new MyYamlBuildConfigReader(new YamlBuildConfigurationReader(buildFileName)); return new YamlBuildConfigurationReader(buildFileName);
} else if (fileNameExtension.equals(".xml")) { } else if (fileNameExtension.equals(".xml")) {
return new MyXMLBuildConfigReader(new XMLBuildConfigurationReader(buildFileName)); return new XMLBuildConfigReaderAdapter(new XMLBuildConfigurationReader(buildFileName));
} else { } else {
return null; return null;
......
...@@ -10,10 +10,10 @@ public class MyBuildFactory implements IBuildFactory { ...@@ -10,10 +10,10 @@ public class MyBuildFactory implements IBuildFactory {
public IBuild createBuild(String buildFileName, BuildConfig buildConfig, String targetName) { public IBuild createBuild(String buildFileName, BuildConfig buildConfig, String targetName) {
String fileNameExtension = buildFileName.substring(buildFileName.lastIndexOf(".")); String fileNameExtension = buildFileName.substring(buildFileName.lastIndexOf("."));
if (fileNameExtension.equals(".yaml")) { if (fileNameExtension.equals(".yaml")) {
return new MyYamlBuild(new Compile(buildConfig, targetName)); return new Compile(buildConfig, targetName);
} else if (fileNameExtension.equals(".xml")) { } else if (fileNameExtension.equals(".xml")) {
return new MyXMLBuild(new Build(buildConfig.getProject()), targetName); return new XMLBuildAdapter(new Build(buildConfig.getProject()), targetName);
} else { } else {
return null; return null;
......
package main;
import yaml.Compile;
public class MyYamlBuild implements IBuild {
Compile adaptee;
public MyYamlBuild(Compile yamlCompile) {
adaptee = yamlCompile;
}
public void build(int debuglevel) {
adaptee.build(debuglevel);
}
}
package main;
import domain.BuildConfig;
import yaml.YamlBuildConfigurationReader;
public class MyYamlBuildConfigReader implements IBuildConfigReader {
private YamlBuildConfigurationReader adaptee;
public MyYamlBuildConfigReader(YamlBuildConfigurationReader buildConfigReader) {
adaptee = buildConfigReader;
}
@Override
public BuildConfig getBuildConfig() {
return adaptee.getBuildConfig();
}
}
...@@ -2,12 +2,12 @@ package main; ...@@ -2,12 +2,12 @@ package main;
import xml.Build; import xml.Build;
public class MyXMLBuild implements IBuild { public class XMLBuildAdapter implements IBuild {
Build adaptee; Build adaptee;
String targetName; String targetName;
public MyXMLBuild(Build xmlBuild, String targetName) { public XMLBuildAdapter(Build xmlBuild, String targetName) {
adaptee = xmlBuild; adaptee = xmlBuild;
this.targetName = targetName; this.targetName = targetName;
} }
......
...@@ -3,11 +3,11 @@ package main; ...@@ -3,11 +3,11 @@ package main;
import domain.BuildConfig; import domain.BuildConfig;
import xml.XMLBuildConfigurationReader; import xml.XMLBuildConfigurationReader;
public class MyXMLBuildConfigReader implements IBuildConfigReader { public class XMLBuildConfigReaderAdapter implements IBuildConfigReader {
private XMLBuildConfigurationReader adaptee; private XMLBuildConfigurationReader adaptee;
public MyXMLBuildConfigReader(XMLBuildConfigurationReader buildConfigReader) { public XMLBuildConfigReaderAdapter(XMLBuildConfigurationReader buildConfigReader) {
adaptee = buildConfigReader; adaptee = buildConfigReader;
} }
......
...@@ -7,8 +7,9 @@ import java.util.Optional; ...@@ -7,8 +7,9 @@ import java.util.Optional;
import domain.BuildConfig; import domain.BuildConfig;
import domain.Project; import domain.Project;
import domain.Target; import domain.Target;
import main.IBuild;
public class Compile { public class Compile implements IBuild {
private Project project; private Project project;
private String targetName; private String targetName;
......
...@@ -4,12 +4,13 @@ import java.io.File; ...@@ -4,12 +4,13 @@ import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import main.IBuildConfigReader;
import net.sourceforge.yamlbeans.YamlException; import net.sourceforge.yamlbeans.YamlException;
import net.sourceforge.yamlbeans.YamlReader; import net.sourceforge.yamlbeans.YamlReader;
import domain.BuildConfig; import domain.BuildConfig;
import domain.Project; import domain.Project;
public class YamlBuildConfigurationReader { public class YamlBuildConfigurationReader implements IBuildConfigReader {
private YamlReader yamlReader; private YamlReader yamlReader;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment