find_cygwin . -type f -print0 | xargs -0 dos2unix
tools & simulator
This commit is contained in:
rusefi
parent
98c5bcef9e
commit
3905d85831
|
|
@ -1,23 +1,23 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="CompilerConfiguration">
|
<component name="CompilerConfiguration">
|
||||||
<option name="DEFAULT_COMPILER" value="Javac" />
|
<option name="DEFAULT_COMPILER" value="Javac" />
|
||||||
<resourceExtensions />
|
<resourceExtensions />
|
||||||
<wildcardResourcePatterns>
|
<wildcardResourcePatterns>
|
||||||
<entry name="!?*.java" />
|
<entry name="!?*.java" />
|
||||||
<entry name="!?*.form" />
|
<entry name="!?*.form" />
|
||||||
<entry name="!?*.class" />
|
<entry name="!?*.class" />
|
||||||
<entry name="!?*.groovy" />
|
<entry name="!?*.groovy" />
|
||||||
<entry name="!?*.scala" />
|
<entry name="!?*.scala" />
|
||||||
<entry name="!?*.flex" />
|
<entry name="!?*.flex" />
|
||||||
<entry name="!?*.kt" />
|
<entry name="!?*.kt" />
|
||||||
<entry name="!?*.clj" />
|
<entry name="!?*.clj" />
|
||||||
</wildcardResourcePatterns>
|
</wildcardResourcePatterns>
|
||||||
<annotationProcessing>
|
<annotationProcessing>
|
||||||
<profile default="true" name="Default" enabled="false">
|
<profile default="true" name="Default" enabled="false">
|
||||||
<processorPath useClasspath="true" />
|
<processorPath useClasspath="true" />
|
||||||
</profile>
|
</profile>
|
||||||
</annotationProcessing>
|
</annotationProcessing>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<component name="CopyrightManager">
|
<component name="CopyrightManager">
|
||||||
<settings default="">
|
<settings default="">
|
||||||
<module2copyright />
|
<module2copyright />
|
||||||
</settings>
|
</settings>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
|
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="EntryPointsManager">
|
<component name="EntryPointsManager">
|
||||||
<entry_points version="2.0" />
|
<entry_points version="2.0" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/out" />
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
</component>
|
</component>
|
||||||
<component name="SvnBranchConfigurationManager">
|
<component name="SvnBranchConfigurationManager">
|
||||||
<option name="mySupportsUserInfoFilter" value="true" />
|
<option name="mySupportsUserInfoFilter" value="true" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ProjectModuleManager">
|
<component name="ProjectModuleManager">
|
||||||
<modules>
|
<modules>
|
||||||
<module fileurl="file://$PROJECT_DIR$/CmpMerge.iml" filepath="$PROJECT_DIR$/CmpMerge.iml" />
|
<module fileurl="file://$PROJECT_DIR$/CmpMerge.iml" filepath="$PROJECT_DIR$/CmpMerge.iml" />
|
||||||
</modules>
|
</modules>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<component name="DependencyValidationManager">
|
<component name="DependencyValidationManager">
|
||||||
<state>
|
<state>
|
||||||
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
|
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
|
||||||
</state>
|
</state>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,125 +1,125 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="Palette2">
|
<component name="Palette2">
|
||||||
<group name="Swing">
|
<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">
|
<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" />
|
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
|
||||||
</item>
|
</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">
|
<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" />
|
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
|
<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" />
|
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="Button" />
|
<property name="text" value="Button" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="RadioButton" />
|
<property name="text" value="RadioButton" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="CheckBox" />
|
<property name="text" value="CheckBox" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="Label" />
|
<property name="text" value="Label" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
<preferred-size width="150" height="-1" />
|
<preferred-size width="150" height="-1" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
<preferred-size width="150" height="-1" />
|
<preferred-size width="150" height="-1" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
<preferred-size width="150" height="-1" />
|
<preferred-size width="150" height="-1" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||||
<preferred-size width="200" height="200" />
|
<preferred-size width="200" height="200" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||||
<preferred-size width="200" height="200" />
|
<preferred-size width="200" height="200" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
|
||||||
<preferred-size width="-1" height="20" />
|
<preferred-size width="-1" height="20" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
|
||||||
</item>
|
</item>
|
||||||
</group>
|
</group>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="VcsDirectoryMappings">
|
<component name="VcsDirectoryMappings">
|
||||||
<mapping directory="" vcs="svn" />
|
<mapping directory="" vcs="svn" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,431 +1,431 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" readonly="true" id="76c7538a-4244-42e9-b994-c6c9cbca491e" name="Default" comment="" />
|
<list default="true" readonly="true" id="76c7538a-4244-42e9-b994-c6c9cbca491e" name="Default" comment="" />
|
||||||
<ignored path="CmpMerge.iws" />
|
<ignored path="CmpMerge.iws" />
|
||||||
<ignored path=".idea/workspace.xml" />
|
<ignored path=".idea/workspace.xml" />
|
||||||
<file path="/CmpMerge.java" changelist="76c7538a-4244-42e9-b994-c6c9cbca491e" time="1386564780632" ignored="false" />
|
<file path="/CmpMerge.java" changelist="76c7538a-4244-42e9-b994-c6c9cbca491e" time="1386564780632" ignored="false" />
|
||||||
<file path="/fragment.java" changelist="76c7538a-4244-42e9-b994-c6c9cbca491e" time="1386564800959" ignored="false" />
|
<file path="/fragment.java" changelist="76c7538a-4244-42e9-b994-c6c9cbca491e" time="1386564800959" ignored="false" />
|
||||||
<option name="TRACKING_ENABLED" value="true" />
|
<option name="TRACKING_ENABLED" value="true" />
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
|
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
|
||||||
<component name="CreatePatchCommitExecutor">
|
<component name="CreatePatchCommitExecutor">
|
||||||
<option name="PATCH_PATH" value="" />
|
<option name="PATCH_PATH" value="" />
|
||||||
</component>
|
</component>
|
||||||
<component name="DaemonCodeAnalyzer">
|
<component name="DaemonCodeAnalyzer">
|
||||||
<disable_hints />
|
<disable_hints />
|
||||||
</component>
|
</component>
|
||||||
<component name="DebuggerManager">
|
<component name="DebuggerManager">
|
||||||
<ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
|
<ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
|
||||||
<breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
|
<breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
|
||||||
<breakpoint>
|
<breakpoint>
|
||||||
<option name="NOTIFY_CAUGHT" value="true" />
|
<option name="NOTIFY_CAUGHT" value="true" />
|
||||||
<option name="NOTIFY_UNCAUGHT" value="true" />
|
<option name="NOTIFY_UNCAUGHT" value="true" />
|
||||||
<option name="ENABLED" value="false" />
|
<option name="ENABLED" value="false" />
|
||||||
<option name="LOG_ENABLED" value="false" />
|
<option name="LOG_ENABLED" value="false" />
|
||||||
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
||||||
<option name="REMOVE_AFTER_HIT" value="false" />
|
<option name="REMOVE_AFTER_HIT" value="false" />
|
||||||
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
||||||
<option name="SUSPEND" value="true" />
|
<option name="SUSPEND" value="true" />
|
||||||
<option name="COUNT_FILTER_ENABLED" value="false" />
|
<option name="COUNT_FILTER_ENABLED" value="false" />
|
||||||
<option name="COUNT_FILTER" value="0" />
|
<option name="COUNT_FILTER" value="0" />
|
||||||
<option name="CONDITION_ENABLED" value="true" />
|
<option name="CONDITION_ENABLED" value="true" />
|
||||||
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
||||||
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
||||||
<option name="CONDITION" value="" />
|
<option name="CONDITION" value="" />
|
||||||
<option name="LOG_MESSAGE" value="" />
|
<option name="LOG_MESSAGE" value="" />
|
||||||
</breakpoint>
|
</breakpoint>
|
||||||
<breakpoint>
|
<breakpoint>
|
||||||
<option name="NOTIFY_CAUGHT" value="true" />
|
<option name="NOTIFY_CAUGHT" value="true" />
|
||||||
<option name="NOTIFY_UNCAUGHT" value="true" />
|
<option name="NOTIFY_UNCAUGHT" value="true" />
|
||||||
<option name="ENABLED" value="false" />
|
<option name="ENABLED" value="false" />
|
||||||
<option name="LOG_ENABLED" value="false" />
|
<option name="LOG_ENABLED" value="false" />
|
||||||
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
||||||
<option name="REMOVE_AFTER_HIT" value="false" />
|
<option name="REMOVE_AFTER_HIT" value="false" />
|
||||||
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
||||||
<option name="SUSPEND" value="true" />
|
<option name="SUSPEND" value="true" />
|
||||||
<option name="COUNT_FILTER_ENABLED" value="false" />
|
<option name="COUNT_FILTER_ENABLED" value="false" />
|
||||||
<option name="COUNT_FILTER" value="0" />
|
<option name="COUNT_FILTER" value="0" />
|
||||||
<option name="CONDITION_ENABLED" value="true" />
|
<option name="CONDITION_ENABLED" value="true" />
|
||||||
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
||||||
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
||||||
<option name="CONDITION" value="" />
|
<option name="CONDITION" value="" />
|
||||||
<option name="LOG_MESSAGE" value="" />
|
<option name="LOG_MESSAGE" value="" />
|
||||||
</breakpoint>
|
</breakpoint>
|
||||||
</breakpoint_any>
|
</breakpoint_any>
|
||||||
<breakpoint_rules />
|
<breakpoint_rules />
|
||||||
<ui_properties />
|
<ui_properties />
|
||||||
</component>
|
</component>
|
||||||
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
|
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
|
||||||
<component name="FavoritesManager">
|
<component name="FavoritesManager">
|
||||||
<favorites_list name="CmpMerge" />
|
<favorites_list name="CmpMerge" />
|
||||||
</component>
|
</component>
|
||||||
<component name="FileEditorManager">
|
<component name="FileEditorManager">
|
||||||
<leaf>
|
<leaf>
|
||||||
<file leaf-file-name="CmpMerge.java" pinned="false" current="true" current-in-tab="true">
|
<file leaf-file-name="CmpMerge.java" pinned="false" current="true" current-in-tab="true">
|
||||||
<entry file="file://$PROJECT_DIR$/src/rusefi/CmpMerge.java">
|
<entry file="file://$PROJECT_DIR$/src/rusefi/CmpMerge.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
|
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
<element signature="e#1326#1334#0" expanded="true" />
|
<element signature="e#1326#1334#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
</leaf>
|
</leaf>
|
||||||
</component>
|
</component>
|
||||||
<component name="FindManager">
|
<component name="FindManager">
|
||||||
<FindUsagesManager>
|
<FindUsagesManager>
|
||||||
<setting name="OPEN_NEW_TAB" value="false" />
|
<setting name="OPEN_NEW_TAB" value="false" />
|
||||||
</FindUsagesManager>
|
</FindUsagesManager>
|
||||||
</component>
|
</component>
|
||||||
<component name="IdeDocumentHistory">
|
<component name="IdeDocumentHistory">
|
||||||
<option name="changedFiles">
|
<option name="changedFiles">
|
||||||
<list>
|
<list>
|
||||||
<option value="$PROJECT_DIR$/src/rusefi/CmpMerge.java" />
|
<option value="$PROJECT_DIR$/src/rusefi/CmpMerge.java" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectFrameBounds">
|
<component name="ProjectFrameBounds">
|
||||||
<option name="x" value="-9" />
|
<option name="x" value="-9" />
|
||||||
<option name="y" value="-9" />
|
<option name="y" value="-9" />
|
||||||
<option name="width" value="1698" />
|
<option name="width" value="1698" />
|
||||||
<option name="height" value="1020" />
|
<option name="height" value="1020" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
||||||
<OptionsSetting value="true" id="Add" />
|
<OptionsSetting value="true" id="Add" />
|
||||||
<OptionsSetting value="true" id="Remove" />
|
<OptionsSetting value="true" id="Remove" />
|
||||||
<OptionsSetting value="true" id="Checkout" />
|
<OptionsSetting value="true" id="Checkout" />
|
||||||
<OptionsSetting value="true" id="Update" />
|
<OptionsSetting value="true" id="Update" />
|
||||||
<OptionsSetting value="true" id="Status" />
|
<OptionsSetting value="true" id="Status" />
|
||||||
<OptionsSetting value="true" id="Edit" />
|
<OptionsSetting value="true" id="Edit" />
|
||||||
<ConfirmationsSetting value="0" id="Add" />
|
<ConfirmationsSetting value="0" id="Add" />
|
||||||
<ConfirmationsSetting value="0" id="Remove" />
|
<ConfirmationsSetting value="0" id="Remove" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectReloadState">
|
<component name="ProjectReloadState">
|
||||||
<option name="STATE" value="0" />
|
<option name="STATE" value="0" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectView">
|
<component name="ProjectView">
|
||||||
<navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
|
<navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
|
||||||
<flattenPackages />
|
<flattenPackages />
|
||||||
<showMembers />
|
<showMembers />
|
||||||
<showModules />
|
<showModules />
|
||||||
<showLibraryContents />
|
<showLibraryContents />
|
||||||
<hideEmptyPackages />
|
<hideEmptyPackages />
|
||||||
<abbreviatePackageNames />
|
<abbreviatePackageNames />
|
||||||
<autoscrollToSource />
|
<autoscrollToSource />
|
||||||
<autoscrollFromSource />
|
<autoscrollFromSource />
|
||||||
<sortByType />
|
<sortByType />
|
||||||
</navigator>
|
</navigator>
|
||||||
<panes>
|
<panes>
|
||||||
<pane id="ProjectPane">
|
<pane id="ProjectPane">
|
||||||
<subPane>
|
<subPane>
|
||||||
<PATH>
|
<PATH>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="CmpMerge" />
|
<option name="myItemId" value="CmpMerge" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
<PATH>
|
<PATH>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="CmpMerge" />
|
<option name="myItemId" value="CmpMerge" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="cmp_merge" />
|
<option name="myItemId" value="cmp_merge" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
</subPane>
|
</subPane>
|
||||||
</pane>
|
</pane>
|
||||||
<pane id="Scope" />
|
<pane id="Scope" />
|
||||||
<pane id="PackagesPane" />
|
<pane id="PackagesPane" />
|
||||||
</panes>
|
</panes>
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
<property name="GoToFile.includeJavaFiles" value="false" />
|
<property name="GoToFile.includeJavaFiles" value="false" />
|
||||||
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
|
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
|
||||||
<property name="recentsLimit" value="5" />
|
<property name="recentsLimit" value="5" />
|
||||||
<property name="MemberChooser.sorted" value="false" />
|
<property name="MemberChooser.sorted" value="false" />
|
||||||
<property name="restartRequiresConfirmation" value="true" />
|
<property name="restartRequiresConfirmation" value="true" />
|
||||||
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
||||||
<property name="MemberChooser.showClasses" value="true" />
|
<property name="MemberChooser.showClasses" value="true" />
|
||||||
<property name="GoToClass.includeLibraries" value="false" />
|
<property name="GoToClass.includeLibraries" value="false" />
|
||||||
<property name="dynamic.classpath" value="false" />
|
<property name="dynamic.classpath" value="false" />
|
||||||
<property name="MemberChooser.copyJavadoc" value="false" />
|
<property name="MemberChooser.copyJavadoc" value="false" />
|
||||||
</component>
|
</component>
|
||||||
<component name="RunManager" selected="Application.CmpMerge">
|
<component name="RunManager" selected="Application.CmpMerge">
|
||||||
<configuration default="false" name="CmpMerge" type="Application" factoryName="Application" temporary="true">
|
<configuration default="false" name="CmpMerge" type="Application" factoryName="Application" temporary="true">
|
||||||
<option name="MAIN_CLASS_NAME" value="rusefi.CmpMerge" />
|
<option name="MAIN_CLASS_NAME" value="rusefi.CmpMerge" />
|
||||||
<option name="VM_PARAMETERS" value="" />
|
<option name="VM_PARAMETERS" value="" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="out.cmp 1.cmp 2.cmp" />
|
<option name="PROGRAM_PARAMETERS" value="out.cmp 1.cmp 2.cmp" />
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<module name="CmpMerge" />
|
<module name="CmpMerge" />
|
||||||
<envs />
|
<envs />
|
||||||
<RunnerSettings RunnerId="Debug">
|
<RunnerSettings RunnerId="Debug">
|
||||||
<option name="DEBUG_PORT" value="" />
|
<option name="DEBUG_PORT" value="" />
|
||||||
<option name="TRANSPORT" value="0" />
|
<option name="TRANSPORT" value="0" />
|
||||||
<option name="LOCAL" value="true" />
|
<option name="LOCAL" value="true" />
|
||||||
</RunnerSettings>
|
</RunnerSettings>
|
||||||
<RunnerSettings RunnerId="Profile ">
|
<RunnerSettings RunnerId="Profile ">
|
||||||
<option name="myExternalizedOptions" value=" additional-options2=onexit\=snapshot " />
|
<option name="myExternalizedOptions" value=" additional-options2=onexit\=snapshot " />
|
||||||
</RunnerSettings>
|
</RunnerSettings>
|
||||||
<RunnerSettings RunnerId="Run" />
|
<RunnerSettings RunnerId="Run" />
|
||||||
<ConfigurationWrapper RunnerId="Debug" />
|
<ConfigurationWrapper RunnerId="Debug" />
|
||||||
<ConfigurationWrapper RunnerId="Run" />
|
<ConfigurationWrapper RunnerId="Run" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
|
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
|
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
|
||||||
<option name="PROGRAM_PARAMETERS" />
|
<option name="PROGRAM_PARAMETERS" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="Remote" factoryName="Remote">
|
<configuration default="true" type="Remote" factoryName="Remote">
|
||||||
<option name="USE_SOCKET_TRANSPORT" value="true" />
|
<option name="USE_SOCKET_TRANSPORT" value="true" />
|
||||||
<option name="SERVER_MODE" value="false" />
|
<option name="SERVER_MODE" value="false" />
|
||||||
<option name="SHMEM_ADDRESS" value="javadebug" />
|
<option name="SHMEM_ADDRESS" value="javadebug" />
|
||||||
<option name="HOST" value="localhost" />
|
<option name="HOST" value="localhost" />
|
||||||
<option name="PORT" value="5005" />
|
<option name="PORT" value="5005" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="Applet" factoryName="Applet">
|
<configuration default="true" type="Applet" factoryName="Applet">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="HTML_FILE_NAME" />
|
<option name="HTML_FILE_NAME" />
|
||||||
<option name="HTML_USED" value="false" />
|
<option name="HTML_USED" value="false" />
|
||||||
<option name="WIDTH" value="400" />
|
<option name="WIDTH" value="400" />
|
||||||
<option name="HEIGHT" value="300" />
|
<option name="HEIGHT" value="300" />
|
||||||
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
|
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
|
||||||
<option name="VM_PARAMETERS" />
|
<option name="VM_PARAMETERS" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="TestNG" factoryName="TestNG">
|
<configuration default="true" type="TestNG" factoryName="TestNG">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<option name="SUITE_NAME" />
|
<option name="SUITE_NAME" />
|
||||||
<option name="PACKAGE_NAME" />
|
<option name="PACKAGE_NAME" />
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="METHOD_NAME" />
|
<option name="METHOD_NAME" />
|
||||||
<option name="GROUP_NAME" />
|
<option name="GROUP_NAME" />
|
||||||
<option name="TEST_OBJECT" value="CLASS" />
|
<option name="TEST_OBJECT" value="CLASS" />
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
<option name="VM_PARAMETERS" value="-ea" />
|
||||||
<option name="PARAMETERS" />
|
<option name="PARAMETERS" />
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
<option name="OUTPUT_DIRECTORY" />
|
<option name="OUTPUT_DIRECTORY" />
|
||||||
<option name="ANNOTATION_TYPE" />
|
<option name="ANNOTATION_TYPE" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
<option name="TEST_SEARCH_SCOPE">
|
||||||
<value defaultName="moduleWithDependencies" />
|
<value defaultName="moduleWithDependencies" />
|
||||||
</option>
|
</option>
|
||||||
<option name="USE_DEFAULT_REPORTERS" value="false" />
|
<option name="USE_DEFAULT_REPORTERS" value="false" />
|
||||||
<option name="PROPERTIES_FILE" />
|
<option name="PROPERTIES_FILE" />
|
||||||
<envs />
|
<envs />
|
||||||
<properties />
|
<properties />
|
||||||
<listeners />
|
<listeners />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="Application" factoryName="Application">
|
<configuration default="true" type="Application" factoryName="Application">
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="VM_PARAMETERS" />
|
<option name="VM_PARAMETERS" />
|
||||||
<option name="PROGRAM_PARAMETERS" />
|
<option name="PROGRAM_PARAMETERS" />
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<envs />
|
<envs />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="JUnit" factoryName="JUnit">
|
<configuration default="true" type="JUnit" factoryName="JUnit">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<option name="PACKAGE_NAME" />
|
<option name="PACKAGE_NAME" />
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="METHOD_NAME" />
|
<option name="METHOD_NAME" />
|
||||||
<option name="TEST_OBJECT" value="class" />
|
<option name="TEST_OBJECT" value="class" />
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
<option name="VM_PARAMETERS" value="-ea" />
|
||||||
<option name="PARAMETERS" />
|
<option name="PARAMETERS" />
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
<option name="TEST_SEARCH_SCOPE">
|
||||||
<value defaultName="moduleWithDependencies" />
|
<value defaultName="moduleWithDependencies" />
|
||||||
</option>
|
</option>
|
||||||
<envs />
|
<envs />
|
||||||
<patterns />
|
<patterns />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<list size="1">
|
<list size="1">
|
||||||
<item index="0" class="java.lang.String" itemvalue="Application.CmpMerge" />
|
<item index="0" class="java.lang.String" itemvalue="Application.CmpMerge" />
|
||||||
</list>
|
</list>
|
||||||
<recent_temporary>
|
<recent_temporary>
|
||||||
<list size="1">
|
<list size="1">
|
||||||
<item index="0" class="java.lang.String" itemvalue="Application.CmpMerge" />
|
<item index="0" class="java.lang.String" itemvalue="Application.CmpMerge" />
|
||||||
</list>
|
</list>
|
||||||
</recent_temporary>
|
</recent_temporary>
|
||||||
<configuration name="<template>" type="WebApp" default="true" selected="false">
|
<configuration name="<template>" type="WebApp" default="true" selected="false">
|
||||||
<Host>localhost</Host>
|
<Host>localhost</Host>
|
||||||
<Port>5050</Port>
|
<Port>5050</Port>
|
||||||
</configuration>
|
</configuration>
|
||||||
</component>
|
</component>
|
||||||
<component name="ShelveChangesManager" show_recycled="false" />
|
<component name="ShelveChangesManager" show_recycled="false" />
|
||||||
<component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="true" SSL_PROTOCOLS="all">
|
<component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="true" SSL_PROTOCOLS="all">
|
||||||
<option name="USER" value="" />
|
<option name="USER" value="" />
|
||||||
<option name="PASSWORD" value="" />
|
<option name="PASSWORD" value="" />
|
||||||
<option name="mySSHConnectionTimeout" value="30000" />
|
<option name="mySSHConnectionTimeout" value="30000" />
|
||||||
<option name="mySSHReadTimeout" value="30000" />
|
<option name="mySSHReadTimeout" value="30000" />
|
||||||
<option name="LAST_MERGED_REVISION" />
|
<option name="LAST_MERGED_REVISION" />
|
||||||
<option name="MERGE_DRY_RUN" value="false" />
|
<option name="MERGE_DRY_RUN" value="false" />
|
||||||
<option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
|
<option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
|
||||||
<option name="UPDATE_LOCK_ON_DEMAND" value="false" />
|
<option name="UPDATE_LOCK_ON_DEMAND" value="false" />
|
||||||
<option name="IGNORE_SPACES_IN_MERGE" value="false" />
|
<option name="IGNORE_SPACES_IN_MERGE" value="false" />
|
||||||
<option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
|
<option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
|
||||||
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
|
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
|
||||||
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
|
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
|
||||||
<option name="FORCE_UPDATE" value="false" />
|
<option name="FORCE_UPDATE" value="false" />
|
||||||
<option name="IGNORE_EXTERNALS" value="false" />
|
<option name="IGNORE_EXTERNALS" value="false" />
|
||||||
<configuration useDefault="false">C:\Users\pc\AppData\Roaming\Subversion</configuration>
|
<configuration useDefault="false">C:\Users\pc\AppData\Roaming\Subversion</configuration>
|
||||||
<myIsUseDefaultProxy>false</myIsUseDefaultProxy>
|
<myIsUseDefaultProxy>false</myIsUseDefaultProxy>
|
||||||
<supportedVersion>125</supportedVersion>
|
<supportedVersion>125</supportedVersion>
|
||||||
</component>
|
</component>
|
||||||
<component name="TaskManager">
|
<component name="TaskManager">
|
||||||
<task active="true" id="Default" summary="Default task">
|
<task active="true" id="Default" summary="Default task">
|
||||||
<changelist id="76c7538a-4244-42e9-b994-c6c9cbca491e" name="Default" comment="" />
|
<changelist id="76c7538a-4244-42e9-b994-c6c9cbca491e" name="Default" comment="" />
|
||||||
<created>1386564339147</created>
|
<created>1386564339147</created>
|
||||||
<updated>1386564339147</updated>
|
<updated>1386564339147</updated>
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="ToolWindowManager">
|
<component name="ToolWindowManager">
|
||||||
<frame x="-9" y="-9" width="1698" height="1020" extended-state="6" />
|
<frame x="-9" y="-9" width="1698" height="1020" extended-state="6" />
|
||||||
<editor active="true" />
|
<editor active="true" />
|
||||||
<layout>
|
<layout>
|
||||||
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3995327" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3995327" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
||||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
||||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.249694" sideWeight="0.6705608" order="0" side_tool="false" content_ui="combo" />
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.249694" sideWeight="0.6705608" order="0" side_tool="false" content_ui="combo" />
|
||||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943925" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943925" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
||||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||||
</layout>
|
</layout>
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsContentAnnotationSettings">
|
<component name="VcsContentAnnotationSettings">
|
||||||
<option name="myLimit" value="2678400000" />
|
<option name="myLimit" value="2678400000" />
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
|
<option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
|
||||||
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
|
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
|
||||||
<option name="CHECK_NEW_TODO" value="true" />
|
<option name="CHECK_NEW_TODO" value="true" />
|
||||||
<option name="myTodoPanelSettings">
|
<option name="myTodoPanelSettings">
|
||||||
<value>
|
<value>
|
||||||
<are-packages-shown value="false" />
|
<are-packages-shown value="false" />
|
||||||
<are-modules-shown value="false" />
|
<are-modules-shown value="false" />
|
||||||
<flatten-packages value="false" />
|
<flatten-packages value="false" />
|
||||||
<is-autoscroll-to-source value="false" />
|
<is-autoscroll-to-source value="false" />
|
||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
<option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
|
<option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
|
||||||
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
|
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
|
||||||
<option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
|
<option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
|
||||||
<option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
|
<option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
|
||||||
<option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
|
<option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
|
||||||
<option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
|
<option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
|
||||||
<option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
|
<option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
|
||||||
<option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
|
<option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
|
||||||
<option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
|
<option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
|
||||||
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
|
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
|
||||||
<option name="DEFAULT_PATCH_EXTENSION" value="patch" />
|
<option name="DEFAULT_PATCH_EXTENSION" value="patch" />
|
||||||
<option name="SHORT_DIFF_HORIZONTALLY" value="true" />
|
<option name="SHORT_DIFF_HORIZONTALLY" value="true" />
|
||||||
<option name="SHORT_DIFF_EXTRA_LINES" value="2" />
|
<option name="SHORT_DIFF_EXTRA_LINES" value="2" />
|
||||||
<option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
|
<option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
|
||||||
<option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
|
<option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
|
||||||
<option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
|
<option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
|
||||||
<option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
|
<option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
|
||||||
<option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
|
<option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
|
||||||
<option name="SHOW_DIRTY_RECURSIVELY" value="false" />
|
<option name="SHOW_DIRTY_RECURSIVELY" value="false" />
|
||||||
<option name="LIMIT_HISTORY" value="true" />
|
<option name="LIMIT_HISTORY" value="true" />
|
||||||
<option name="MAXIMUM_HISTORY_ROWS" value="1000" />
|
<option name="MAXIMUM_HISTORY_ROWS" value="1000" />
|
||||||
<option name="UPDATE_FILTER_SCOPE_NAME" />
|
<option name="UPDATE_FILTER_SCOPE_NAME" />
|
||||||
<option name="USE_COMMIT_MESSAGE_MARGIN" value="false" />
|
<option name="USE_COMMIT_MESSAGE_MARGIN" value="false" />
|
||||||
<option name="COMMIT_MESSAGE_MARGIN_SIZE" value="72" />
|
<option name="COMMIT_MESSAGE_MARGIN_SIZE" value="72" />
|
||||||
<option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
|
<option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
|
||||||
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
|
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
|
||||||
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
|
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" />
|
<option name="LAST_COMMIT_MESSAGE" />
|
||||||
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
|
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
|
||||||
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
|
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
|
||||||
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
|
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
|
||||||
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
|
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
|
||||||
<option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
|
<option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
|
||||||
<option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
|
<option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
|
||||||
<option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
|
<option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
|
||||||
<option name="ACTIVE_VCS_NAME" />
|
<option name="ACTIVE_VCS_NAME" />
|
||||||
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
|
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
|
||||||
<option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
|
<option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
|
||||||
<option name="UPDATE_FILTER_BY_SCOPE" value="false" />
|
<option name="UPDATE_FILTER_BY_SCOPE" value="false" />
|
||||||
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
|
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
|
||||||
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
|
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
|
||||||
</component>
|
</component>
|
||||||
<component name="XDebuggerManager">
|
<component name="XDebuggerManager">
|
||||||
<breakpoint-manager />
|
<breakpoint-manager />
|
||||||
</component>
|
</component>
|
||||||
<component name="antWorkspaceConfiguration">
|
<component name="antWorkspaceConfiguration">
|
||||||
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
||||||
<option name="FILTER_TARGETS" value="false" />
|
<option name="FILTER_TARGETS" value="false" />
|
||||||
</component>
|
</component>
|
||||||
<component name="editorHistoryManager">
|
<component name="editorHistoryManager">
|
||||||
<entry file="file://$PROJECT_DIR$/src/rusefi/CmpMerge.java">
|
<entry file="file://$PROJECT_DIR$/src/rusefi/CmpMerge.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
|
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
<element signature="e#1326#1334#0" expanded="true" />
|
<element signature="e#1326#1334#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/rusefi/CmpMerge.java">
|
<entry file="file://$PROJECT_DIR$/src/rusefi/CmpMerge.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
|
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
<element signature="e#1326#1334#0" expanded="true" />
|
<element signature="e#1326#1334#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module type="JAVA_MODULE" version="4">
|
<module type="JAVA_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,24 @@
|
||||||
<project default="jar">
|
<project default="jar">
|
||||||
|
|
||||||
<target name="clean">
|
<target name="clean">
|
||||||
<delete dir="build"/>
|
<delete dir="build"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="compile">
|
<target name="compile">
|
||||||
<mkdir dir="build/classes"/>
|
<mkdir dir="build/classes"/>
|
||||||
<javac destdir="build/classes" classpath="lib/junit.jar:lib/annotations.jar">
|
<javac destdir="build/classes" classpath="lib/junit.jar:lib/annotations.jar">
|
||||||
<src path="src"/>
|
<src path="src"/>
|
||||||
</javac>
|
</javac>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="jar" depends="compile">
|
<target name="jar" depends="compile">
|
||||||
<mkdir dir="build/jar"/>
|
<mkdir dir="build/jar"/>
|
||||||
<jar destfile="../cmp_merge.jar" basedir="build/classes">
|
<jar destfile="../cmp_merge.jar" basedir="build/classes">
|
||||||
<manifest>
|
<manifest>
|
||||||
<attribute name="Main-Class" value="rusefi.CmpMerge"/>
|
<attribute name="Main-Class" value="rusefi.CmpMerge"/>
|
||||||
</manifest>
|
</manifest>
|
||||||
<zipfileset dir="build/classes" includes="**/*.class"/>
|
<zipfileset dir="build/classes" includes="**/*.class"/>
|
||||||
</jar>
|
</jar>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -1,63 +1,63 @@
|
||||||
package rusefi;
|
package rusefi;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 12/8/13
|
* 12/8/13
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
*/
|
*/
|
||||||
public class CmpMerge {
|
public class CmpMerge {
|
||||||
private CmpMerge() {
|
private CmpMerge() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) throws IOException {
|
public static void main(String[] args) throws IOException {
|
||||||
if (args.length < 2) {
|
if (args.length < 2) {
|
||||||
System.out.println("This tool merges .cmp KiCad component mappting files");
|
System.out.println("This tool merges .cmp KiCad component mappting files");
|
||||||
System.out.println("usage:");
|
System.out.println("usage:");
|
||||||
System.out.println("NetListMerge DEST_FILE SOURCE_1 SOURCE_2 [SOURCE_x]*");
|
System.out.println("NetListMerge DEST_FILE SOURCE_1 SOURCE_2 [SOURCE_x]*");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
String destinationFile = args[0];
|
String destinationFile = args[0];
|
||||||
|
|
||||||
System.out.println("Writing result into " + destinationFile);
|
System.out.println("Writing result into " + destinationFile);
|
||||||
BufferedWriter bw = new BufferedWriter(new FileWriter(destinationFile));
|
BufferedWriter bw = new BufferedWriter(new FileWriter(destinationFile));
|
||||||
|
|
||||||
bw.write("Cmp-Mod V01 Created by CvPcb (2013-07-07 BZR 4022)-stable date = 01/12/2013 21:54:01\r\n");
|
bw.write("Cmp-Mod V01 Created by CvPcb (2013-07-07 BZR 4022)-stable date = 01/12/2013 21:54:01\r\n");
|
||||||
|
|
||||||
for (int i = 1; i < args.length; i++) {
|
for (int i = 1; i < args.length; i++) {
|
||||||
String sourceFile = args[i];
|
String sourceFile = args[i];
|
||||||
|
|
||||||
List<String> list = readFileToList(sourceFile);
|
List<String> list = readFileToList(sourceFile);
|
||||||
|
|
||||||
for (String line : list.subList(1, list.size() - 2))
|
for (String line : list.subList(1, list.size() - 2))
|
||||||
bw.write(line + "\r\n");
|
bw.write(line + "\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
bw.write("\r\nEndListe\r\n");
|
bw.write("\r\nEndListe\r\n");
|
||||||
bw.close();
|
bw.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
static List<String> readFileToList(String fileName) throws IOException {
|
static List<String> readFileToList(String fileName) throws IOException {
|
||||||
checkExistence(fileName);
|
checkExistence(fileName);
|
||||||
|
|
||||||
List<String> result = new ArrayList<String>();
|
List<String> result = new ArrayList<String>();
|
||||||
|
|
||||||
System.out.println("Reading " + fileName);
|
System.out.println("Reading " + fileName);
|
||||||
String line;
|
String line;
|
||||||
BufferedReader br = new BufferedReader(new FileReader(fileName));
|
BufferedReader br = new BufferedReader(new FileReader(fileName));
|
||||||
|
|
||||||
while (((line = br.readLine()) != null))
|
while (((line = br.readLine()) != null))
|
||||||
result.add(line);
|
result.add(line);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void checkExistence(String fileName) {
|
private static void checkExistence(String fileName) {
|
||||||
if (!new File(fileName).isFile()) {
|
if (!new File(fileName).isFile()) {
|
||||||
System.err.println("File not found: " + fileName);
|
System.err.println("File not found: " + fileName);
|
||||||
System.exit(-1);
|
System.exit(-1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,23 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="CompilerConfiguration">
|
<component name="CompilerConfiguration">
|
||||||
<option name="DEFAULT_COMPILER" value="Javac" />
|
<option name="DEFAULT_COMPILER" value="Javac" />
|
||||||
<resourceExtensions />
|
<resourceExtensions />
|
||||||
<wildcardResourcePatterns>
|
<wildcardResourcePatterns>
|
||||||
<entry name="!?*.java" />
|
<entry name="!?*.java" />
|
||||||
<entry name="!?*.form" />
|
<entry name="!?*.form" />
|
||||||
<entry name="!?*.class" />
|
<entry name="!?*.class" />
|
||||||
<entry name="!?*.groovy" />
|
<entry name="!?*.groovy" />
|
||||||
<entry name="!?*.scala" />
|
<entry name="!?*.scala" />
|
||||||
<entry name="!?*.flex" />
|
<entry name="!?*.flex" />
|
||||||
<entry name="!?*.kt" />
|
<entry name="!?*.kt" />
|
||||||
<entry name="!?*.clj" />
|
<entry name="!?*.clj" />
|
||||||
</wildcardResourcePatterns>
|
</wildcardResourcePatterns>
|
||||||
<annotationProcessing>
|
<annotationProcessing>
|
||||||
<profile default="true" name="Default" enabled="false">
|
<profile default="true" name="Default" enabled="false">
|
||||||
<processorPath useClasspath="true" />
|
<processorPath useClasspath="true" />
|
||||||
</profile>
|
</profile>
|
||||||
</annotationProcessing>
|
</annotationProcessing>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<component name="CopyrightManager">
|
<component name="CopyrightManager">
|
||||||
<settings default="">
|
<settings default="">
|
||||||
<module2copyright />
|
<module2copyright />
|
||||||
</settings>
|
</settings>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
|
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="junit">
|
<library name="junit">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="jar://$PROJECT_DIR$/lib/junit.jar!/" />
|
<root url="jar://$PROJECT_DIR$/lib/junit.jar!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="EntryPointsManager">
|
<component name="EntryPointsManager">
|
||||||
<entry_points version="2.0" />
|
<entry_points version="2.0" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/out" />
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
</component>
|
</component>
|
||||||
<component name="SvnBranchConfigurationManager">
|
<component name="SvnBranchConfigurationManager">
|
||||||
<option name="mySupportsUserInfoFilter" value="true" />
|
<option name="mySupportsUserInfoFilter" value="true" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ProjectModuleManager">
|
<component name="ProjectModuleManager">
|
||||||
<modules>
|
<modules>
|
||||||
<module fileurl="file://$PROJECT_DIR$/configuration_definition.iml" filepath="$PROJECT_DIR$/configuration_definition.iml" />
|
<module fileurl="file://$PROJECT_DIR$/configuration_definition.iml" filepath="$PROJECT_DIR$/configuration_definition.iml" />
|
||||||
</modules>
|
</modules>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<component name="DependencyValidationManager">
|
<component name="DependencyValidationManager">
|
||||||
<state>
|
<state>
|
||||||
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
|
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
|
||||||
</state>
|
</state>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,125 +1,125 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="Palette2">
|
<component name="Palette2">
|
||||||
<group name="Swing">
|
<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">
|
<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" />
|
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
|
||||||
</item>
|
</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">
|
<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" />
|
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
|
<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" />
|
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="Button" />
|
<property name="text" value="Button" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="RadioButton" />
|
<property name="text" value="RadioButton" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="CheckBox" />
|
<property name="text" value="CheckBox" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="Label" />
|
<property name="text" value="Label" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
<preferred-size width="150" height="-1" />
|
<preferred-size width="150" height="-1" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
<preferred-size width="150" height="-1" />
|
<preferred-size width="150" height="-1" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
<preferred-size width="150" height="-1" />
|
<preferred-size width="150" height="-1" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||||
<preferred-size width="200" height="200" />
|
<preferred-size width="200" height="200" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||||
<preferred-size width="200" height="200" />
|
<preferred-size width="200" height="200" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
|
||||||
<preferred-size width="-1" height="20" />
|
<preferred-size width="-1" height="20" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
|
||||||
</item>
|
</item>
|
||||||
</group>
|
</group>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="VcsDirectoryMappings">
|
<component name="VcsDirectoryMappings">
|
||||||
<mapping directory="" vcs="svn" />
|
<mapping directory="" vcs="svn" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,24 +1,24 @@
|
||||||
<project default="jar">
|
<project default="jar">
|
||||||
|
|
||||||
<target name="clean">
|
<target name="clean">
|
||||||
<delete dir="build"/>
|
<delete dir="build"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="compile">
|
<target name="compile">
|
||||||
<mkdir dir="build/classes"/>
|
<mkdir dir="build/classes"/>
|
||||||
<javac destdir="build/classes" classpath="lib/junit.jar:lib/annotations.jar">
|
<javac destdir="build/classes" classpath="lib/junit.jar:lib/annotations.jar">
|
||||||
<src path="src"/>
|
<src path="src"/>
|
||||||
</javac>
|
</javac>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="jar" depends="compile">
|
<target name="jar" depends="compile">
|
||||||
<mkdir dir="build/jar"/>
|
<mkdir dir="build/jar"/>
|
||||||
<jar destfile="../ConfigDefinition.jar" basedir="build/classes">
|
<jar destfile="../ConfigDefinition.jar" basedir="build/classes">
|
||||||
<manifest>
|
<manifest>
|
||||||
<attribute name="Main-Class" value="com.rusefi.ConfigDefinition"/>
|
<attribute name="Main-Class" value="com.rusefi.ConfigDefinition"/>
|
||||||
</manifest>
|
</manifest>
|
||||||
<zipfileset dir="build/classes" includes="**/*.class"/>
|
<zipfileset dir="build/classes" includes="**/*.class"/>
|
||||||
</jar>
|
</jar>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -1,21 +1,21 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module type="JAVA_MODULE" version="4">
|
<module type="JAVA_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="module-library">
|
<orderEntry type="module-library">
|
||||||
<library>
|
<library>
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.10.jar!/" />
|
<root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.10.jar!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
</library>
|
</library>
|
||||||
</orderEntry>
|
</orderEntry>
|
||||||
<orderEntry type="library" name="junit" level="project" />
|
<orderEntry type="library" name="junit" level="project" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
|
@ -1,27 +1,27 @@
|
||||||
package com.rusefi;
|
package com.rusefi;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 6/4/2015.
|
* 6/4/2015.
|
||||||
*/
|
*/
|
||||||
public class BitState {
|
public class BitState {
|
||||||
private int bitIndex;
|
private int bitIndex;
|
||||||
|
|
||||||
public void incrementBitIndex(ConfigField cf, ConfigField next) {
|
public void incrementBitIndex(ConfigField cf, ConfigField next) {
|
||||||
if (!cf.isBit) {
|
if (!cf.isBit) {
|
||||||
bitIndex = 0;
|
bitIndex = 0;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
bitIndex++;
|
bitIndex++;
|
||||||
if (bitIndex == 32)
|
if (bitIndex == 32)
|
||||||
throw new IllegalStateException("todo: too many bits, not supported");
|
throw new IllegalStateException("todo: too many bits, not supported");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void reset() {
|
public void reset() {
|
||||||
bitIndex = 0;
|
bitIndex = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int get() {
|
public int get() {
|
||||||
return bitIndex;
|
return bitIndex;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,354 +1,354 @@
|
||||||
package com.rusefi;
|
package com.rusefi;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Stack;
|
import java.util.Stack;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 1/12/15
|
* 1/12/15
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("StringConcatenationInsideStringBufferAppend")
|
@SuppressWarnings("StringConcatenationInsideStringBufferAppend")
|
||||||
public class ConfigDefinition {
|
public class ConfigDefinition {
|
||||||
private static final String INPUT_FILE_NAME = "rusefi_config.txt";
|
private static final String INPUT_FILE_NAME = "rusefi_config.txt";
|
||||||
private static final String MESSAGE = "was generated automatically by ConfigDefinition.jar based on " + INPUT_FILE_NAME + " " + new Date();
|
private static final String MESSAGE = "was generated automatically by ConfigDefinition.jar based on " + INPUT_FILE_NAME + " " + new Date();
|
||||||
private static final String TS_FILE_INPUT_NAME = "rusefi.input";
|
private static final String TS_FILE_INPUT_NAME = "rusefi.input";
|
||||||
private static final String TS_FILE_OUTPUT_NAME = "rusefi.ini";
|
private static final String TS_FILE_OUTPUT_NAME = "rusefi.ini";
|
||||||
private static final String STRUCT_NO_PREFIX = "struct_no_prefix ";
|
private static final String STRUCT_NO_PREFIX = "struct_no_prefix ";
|
||||||
private static final String STRUCT = "struct ";
|
private static final String STRUCT = "struct ";
|
||||||
private static final String END_STRUCT = "end_struct";
|
private static final String END_STRUCT = "end_struct";
|
||||||
private static final String CUSTOM = "custom";
|
private static final String CUSTOM = "custom";
|
||||||
private static final String DEFINE = "#define";
|
private static final String DEFINE = "#define";
|
||||||
private static final String BIT = "bit";
|
private static final String BIT = "bit";
|
||||||
private static final String CONFIG_DEFINITION_START = "CONFIG_DEFINITION_START";
|
private static final String CONFIG_DEFINITION_START = "CONFIG_DEFINITION_START";
|
||||||
private static final String CONFIG_DEFINITION_END = "CONFIG_DEFINITION_END";
|
private static final String CONFIG_DEFINITION_END = "CONFIG_DEFINITION_END";
|
||||||
private static final String ROM_RAIDER_XML = "rusefi.xml";
|
private static final String ROM_RAIDER_XML = "rusefi.xml";
|
||||||
private static final String ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H = "engine_configuration_generated_structures.h";
|
private static final String ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H = "engine_configuration_generated_structures.h";
|
||||||
private static final String FIELDS_JAVA = "models/src/com/rusefi/config/Fields.java";
|
private static final String FIELDS_JAVA = "models/src/com/rusefi/config/Fields.java";
|
||||||
private static int totalTsSize;
|
private static int totalTsSize;
|
||||||
|
|
||||||
private static Stack<ConfigStructure> stack = new Stack<>();
|
private static Stack<ConfigStructure> stack = new Stack<>();
|
||||||
public static Map<String, ConfigStructure> structures = new HashMap<>();
|
public static Map<String, ConfigStructure> structures = new HashMap<>();
|
||||||
public static Map<String, String> tsCustomLine = new HashMap<>();
|
public static Map<String, String> tsCustomLine = new HashMap<>();
|
||||||
public static Map<String, Integer> tsCustomSize = new HashMap<>();
|
public static Map<String, Integer> tsCustomSize = new HashMap<>();
|
||||||
public static StringBuilder settingContextHelp = new StringBuilder();
|
public static StringBuilder settingContextHelp = new StringBuilder();
|
||||||
|
|
||||||
public static void main(String[] args) throws IOException {
|
public static void main(String[] args) throws IOException {
|
||||||
if (args.length != 4) {
|
if (args.length != 4) {
|
||||||
System.out.println("Please specify path to '" + INPUT_FILE_NAME + "' file, path to " + TS_FILE_INPUT_NAME +
|
System.out.println("Please specify path to '" + INPUT_FILE_NAME + "' file, path to " + TS_FILE_INPUT_NAME +
|
||||||
" and destination folder");
|
" and destination folder");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
String inputPath = args[0];
|
String inputPath = args[0];
|
||||||
String tsPath = args[1];
|
String tsPath = args[1];
|
||||||
String headerDestinationFolder = args[2];
|
String headerDestinationFolder = args[2];
|
||||||
String javaConsolePath = args[3];
|
String javaConsolePath = args[3];
|
||||||
String fullFileName = inputPath + File.separator + INPUT_FILE_NAME;
|
String fullFileName = inputPath + File.separator + INPUT_FILE_NAME;
|
||||||
System.out.println("Reading from " + fullFileName);
|
System.out.println("Reading from " + fullFileName);
|
||||||
String destCHeader = headerDestinationFolder + File.separator + ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H;
|
String destCHeader = headerDestinationFolder + File.separator + ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H;
|
||||||
System.out.println("Writing C header to " + destCHeader);
|
System.out.println("Writing C header to " + destCHeader);
|
||||||
|
|
||||||
BufferedWriter cHeader = new BufferedWriter(new FileWriter(destCHeader));
|
BufferedWriter cHeader = new BufferedWriter(new FileWriter(destCHeader));
|
||||||
|
|
||||||
BufferedReader br = new BufferedReader(new FileReader(fullFileName));
|
BufferedReader br = new BufferedReader(new FileReader(fullFileName));
|
||||||
|
|
||||||
CharArrayWriter tsWriter = new CharArrayWriter();
|
CharArrayWriter tsWriter = new CharArrayWriter();
|
||||||
|
|
||||||
CharArrayWriter javaFieldsWriter = new CharArrayWriter();
|
CharArrayWriter javaFieldsWriter = new CharArrayWriter();
|
||||||
|
|
||||||
processFile(br, cHeader, tsWriter, javaFieldsWriter);
|
processFile(br, cHeader, tsWriter, javaFieldsWriter);
|
||||||
|
|
||||||
BufferedWriter javaFields = new BufferedWriter(new FileWriter(javaConsolePath + File.separator + FIELDS_JAVA));
|
BufferedWriter javaFields = new BufferedWriter(new FileWriter(javaConsolePath + File.separator + FIELDS_JAVA));
|
||||||
javaFields.write("package com.rusefi.config;\r\n\r\n");
|
javaFields.write("package com.rusefi.config;\r\n\r\n");
|
||||||
javaFields.write("// this file " + MESSAGE + "\r\n");
|
javaFields.write("// this file " + MESSAGE + "\r\n");
|
||||||
javaFields.write("public class Fields {\r\n");
|
javaFields.write("public class Fields {\r\n");
|
||||||
javaFields.write(VariableRegistry.INSTANCE.getJavaConstants());
|
javaFields.write(VariableRegistry.INSTANCE.getJavaConstants());
|
||||||
javaFields.write(javaFieldsWriter.toString());
|
javaFields.write(javaFieldsWriter.toString());
|
||||||
javaFields.write("}\r\n");
|
javaFields.write("}\r\n");
|
||||||
javaFields.close();
|
javaFields.close();
|
||||||
|
|
||||||
|
|
||||||
BufferedWriter tsHeader = writeTunerStudioFile(tsPath, tsWriter.toString());
|
BufferedWriter tsHeader = writeTunerStudioFile(tsPath, tsWriter.toString());
|
||||||
|
|
||||||
if (!stack.isEmpty())
|
if (!stack.isEmpty())
|
||||||
throw new IllegalStateException("Unclosed structure: " + stack.peek().name);
|
throw new IllegalStateException("Unclosed structure: " + stack.peek().name);
|
||||||
|
|
||||||
cHeader.close();
|
cHeader.close();
|
||||||
tsHeader.close();
|
tsHeader.close();
|
||||||
|
|
||||||
VariableRegistry.INSTANCE.writeNumericsToFile(headerDestinationFolder);
|
VariableRegistry.INSTANCE.writeNumericsToFile(headerDestinationFolder);
|
||||||
|
|
||||||
writeTsSizeForJavaConsole(totalTsSize, javaConsolePath);
|
writeTsSizeForJavaConsole(totalTsSize, javaConsolePath);
|
||||||
processTextTemplate(inputPath + File.separator + ROM_RAIDER_XML, javaConsolePath + File.separator + ROM_RAIDER_XML);
|
processTextTemplate(inputPath + File.separator + ROM_RAIDER_XML, javaConsolePath + File.separator + ROM_RAIDER_XML);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static BufferedWriter writeTunerStudioFile(String tsPath, String fieldsSection) throws IOException {
|
private static BufferedWriter writeTunerStudioFile(String tsPath, String fieldsSection) throws IOException {
|
||||||
TsFileContent tsContent = readTsFile(tsPath);
|
TsFileContent tsContent = readTsFile(tsPath);
|
||||||
System.out.println("Got " + tsContent.getPrefix().length() + "/" + tsContent.getPostfix().length() + " of " + TS_FILE_INPUT_NAME);
|
System.out.println("Got " + tsContent.getPrefix().length() + "/" + tsContent.getPostfix().length() + " of " + TS_FILE_INPUT_NAME);
|
||||||
|
|
||||||
BufferedWriter tsHeader = new BufferedWriter(new FileWriter(tsPath + File.separator + TS_FILE_OUTPUT_NAME));
|
BufferedWriter tsHeader = new BufferedWriter(new FileWriter(tsPath + File.separator + TS_FILE_OUTPUT_NAME));
|
||||||
tsHeader.write(tsContent.getPrefix());
|
tsHeader.write(tsContent.getPrefix());
|
||||||
|
|
||||||
tsHeader.write("; " + CONFIG_DEFINITION_START + "\r\n");
|
tsHeader.write("; " + CONFIG_DEFINITION_START + "\r\n");
|
||||||
tsHeader.write("; this section " + MESSAGE + "\r\n\r\n");
|
tsHeader.write("; this section " + MESSAGE + "\r\n\r\n");
|
||||||
tsHeader.write("pageSize = " + totalTsSize + "\r\n");
|
tsHeader.write("pageSize = " + totalTsSize + "\r\n");
|
||||||
tsHeader.write("page = 1\r\n");
|
tsHeader.write("page = 1\r\n");
|
||||||
tsHeader.write(fieldsSection);
|
tsHeader.write(fieldsSection);
|
||||||
if (settingContextHelp.length() > 0) {
|
if (settingContextHelp.length() > 0) {
|
||||||
tsHeader.write("[SettingContextHelp]\r\n");
|
tsHeader.write("[SettingContextHelp]\r\n");
|
||||||
tsHeader.write(settingContextHelp.toString() + "\r\n\r\n");
|
tsHeader.write(settingContextHelp.toString() + "\r\n\r\n");
|
||||||
}
|
}
|
||||||
tsHeader.write("; " + CONFIG_DEFINITION_END + "\r\n");
|
tsHeader.write("; " + CONFIG_DEFINITION_END + "\r\n");
|
||||||
tsHeader.write(tsContent.getPostfix());
|
tsHeader.write(tsContent.getPostfix());
|
||||||
return tsHeader;
|
return tsHeader;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void processTextTemplate(String inputFileName, String outputFileName) throws IOException {
|
private static void processTextTemplate(String inputFileName, String outputFileName) throws IOException {
|
||||||
System.out.println("Reading from " + inputFileName);
|
System.out.println("Reading from " + inputFileName);
|
||||||
System.out.println("Writing to " + outputFileName);
|
System.out.println("Writing to " + outputFileName);
|
||||||
|
|
||||||
VariableRegistry.INSTANCE.put("generator_message", "Generated by ConfigDefinition utility on " + new Date());
|
VariableRegistry.INSTANCE.put("generator_message", "Generated by ConfigDefinition utility on " + new Date());
|
||||||
|
|
||||||
File inputFile = new File(inputFileName);
|
File inputFile = new File(inputFileName);
|
||||||
|
|
||||||
File outputFile = new File(outputFileName);
|
File outputFile = new File(outputFileName);
|
||||||
BufferedReader fr = new BufferedReader(new FileReader(inputFile));
|
BufferedReader fr = new BufferedReader(new FileReader(inputFile));
|
||||||
FileWriter fw = new FileWriter(outputFile);
|
FileWriter fw = new FileWriter(outputFile);
|
||||||
|
|
||||||
String line;
|
String line;
|
||||||
while ((line = fr.readLine()) != null) {
|
while ((line = fr.readLine()) != null) {
|
||||||
line = VariableRegistry.INSTANCE.processLine(line);
|
line = VariableRegistry.INSTANCE.processLine(line);
|
||||||
fw.write(line + "\r\n");
|
fw.write(line + "\r\n");
|
||||||
}
|
}
|
||||||
fw.close();
|
fw.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
// todo: re-implement using VariableRegistry and a template?
|
// todo: re-implement using VariableRegistry and a template?
|
||||||
private static void writeTsSizeForJavaConsole(int totalTsSize, String javaConsoleIoFolderPath) throws IOException {
|
private static void writeTsSizeForJavaConsole(int totalTsSize, String javaConsoleIoFolderPath) throws IOException {
|
||||||
String fileName = javaConsoleIoFolderPath +
|
String fileName = javaConsoleIoFolderPath +
|
||||||
File.separator + "io" +
|
File.separator + "io" +
|
||||||
File.separator + "src" +
|
File.separator + "src" +
|
||||||
File.separator + "com" +
|
File.separator + "com" +
|
||||||
File.separator + "rusefi" +
|
File.separator + "rusefi" +
|
||||||
File.separator + "TsPageSize.java";
|
File.separator + "TsPageSize.java";
|
||||||
File f = new File(fileName);
|
File f = new File(fileName);
|
||||||
|
|
||||||
System.out.println("Writing for console to " + fileName);
|
System.out.println("Writing for console to " + fileName);
|
||||||
|
|
||||||
FileWriter fw = new FileWriter(f);
|
FileWriter fw = new FileWriter(f);
|
||||||
|
|
||||||
fw.write("package com.rusefi;\r\n\r\n");
|
fw.write("package com.rusefi;\r\n\r\n");
|
||||||
fw.write("public interface TsPageSize {\r\n");
|
fw.write("public interface TsPageSize {\r\n");
|
||||||
fw.write(" int IMAGE_SIZE = " + totalTsSize + ";\n");
|
fw.write(" int IMAGE_SIZE = " + totalTsSize + ";\n");
|
||||||
fw.write("}\n");
|
fw.write("}\n");
|
||||||
|
|
||||||
fw.close();
|
fw.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static TsFileContent readTsFile(String tsPath) throws IOException {
|
private static TsFileContent readTsFile(String tsPath) throws IOException {
|
||||||
BufferedReader r = new BufferedReader(new FileReader(tsPath + File.separator + TS_FILE_INPUT_NAME));
|
BufferedReader r = new BufferedReader(new FileReader(tsPath + File.separator + TS_FILE_INPUT_NAME));
|
||||||
|
|
||||||
StringBuilder prefix = new StringBuilder();
|
StringBuilder prefix = new StringBuilder();
|
||||||
StringBuilder postfix = new StringBuilder();
|
StringBuilder postfix = new StringBuilder();
|
||||||
|
|
||||||
boolean isBeforeStartTag = true;
|
boolean isBeforeStartTag = true;
|
||||||
boolean isAfterEndTag = false;
|
boolean isAfterEndTag = false;
|
||||||
String line;
|
String line;
|
||||||
while ((line = r.readLine()) != null) {
|
while ((line = r.readLine()) != null) {
|
||||||
if (line.contains(CONFIG_DEFINITION_START)) {
|
if (line.contains(CONFIG_DEFINITION_START)) {
|
||||||
isBeforeStartTag = false;
|
isBeforeStartTag = false;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (line.contains(CONFIG_DEFINITION_END)) {
|
if (line.contains(CONFIG_DEFINITION_END)) {
|
||||||
isAfterEndTag = true;
|
isAfterEndTag = true;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isBeforeStartTag)
|
if (isBeforeStartTag)
|
||||||
prefix.append(line + "\r\n");
|
prefix.append(line + "\r\n");
|
||||||
|
|
||||||
if (isAfterEndTag)
|
if (isAfterEndTag)
|
||||||
postfix.append(VariableRegistry.INSTANCE.processLine(line) + "\r\n");
|
postfix.append(VariableRegistry.INSTANCE.processLine(line) + "\r\n");
|
||||||
}
|
}
|
||||||
r.close();
|
r.close();
|
||||||
return new TsFileContent(prefix.toString(), postfix.toString());
|
return new TsFileContent(prefix.toString(), postfix.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void processFile(BufferedReader br, BufferedWriter cHeader, Writer tsHeader, CharArrayWriter javaFieldsWriter) throws IOException {
|
private static void processFile(BufferedReader br, BufferedWriter cHeader, Writer tsHeader, CharArrayWriter javaFieldsWriter) throws IOException {
|
||||||
String line;
|
String line;
|
||||||
|
|
||||||
String message = "// this section " + MESSAGE + "\r\n";
|
String message = "// this section " + MESSAGE + "\r\n";
|
||||||
cHeader.write(message);
|
cHeader.write(message);
|
||||||
cHeader.write("// begin\r\n");
|
cHeader.write("// begin\r\n");
|
||||||
cHeader.write("#ifndef ENGINE_CONFIGURATION_GENERATED_H_\r\n");
|
cHeader.write("#ifndef ENGINE_CONFIGURATION_GENERATED_H_\r\n");
|
||||||
cHeader.write("#define ENGINE_CONFIGURATION_GENERATED_H_\r\n");
|
cHeader.write("#define ENGINE_CONFIGURATION_GENERATED_H_\r\n");
|
||||||
cHeader.write("#include \"rusefi_types.h\"\n");
|
cHeader.write("#include \"rusefi_types.h\"\n");
|
||||||
|
|
||||||
while ((line = br.readLine()) != null) {
|
while ((line = br.readLine()) != null) {
|
||||||
line = line.trim();
|
line = line.trim();
|
||||||
line = line.replaceAll("\\s+", " ");
|
line = line.replaceAll("\\s+", " ");
|
||||||
/**
|
/**
|
||||||
* we should ignore empty lines and comments
|
* we should ignore empty lines and comments
|
||||||
*/
|
*/
|
||||||
if (line.length() == 0 || line.startsWith("!"))
|
if (line.length() == 0 || line.startsWith("!"))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (line.startsWith(STRUCT)) {
|
if (line.startsWith(STRUCT)) {
|
||||||
handleStartStructure(line.substring(STRUCT.length()), true);
|
handleStartStructure(line.substring(STRUCT.length()), true);
|
||||||
} else if (line.startsWith(STRUCT_NO_PREFIX)) {
|
} else if (line.startsWith(STRUCT_NO_PREFIX)) {
|
||||||
handleStartStructure(line.substring(STRUCT_NO_PREFIX.length()), false);
|
handleStartStructure(line.substring(STRUCT_NO_PREFIX.length()), false);
|
||||||
} else if (line.startsWith(END_STRUCT)) {
|
} else if (line.startsWith(END_STRUCT)) {
|
||||||
handleEndStruct(cHeader, tsHeader, javaFieldsWriter);
|
handleEndStruct(cHeader, tsHeader, javaFieldsWriter);
|
||||||
} else if (line.startsWith(BIT)) {
|
} else if (line.startsWith(BIT)) {
|
||||||
line = line.substring(BIT.length() + 1).trim();
|
line = line.substring(BIT.length() + 1).trim();
|
||||||
|
|
||||||
String bitName;
|
String bitName;
|
||||||
String comment;
|
String comment;
|
||||||
if (!line.contains(";")) {
|
if (!line.contains(";")) {
|
||||||
bitName = line;
|
bitName = line;
|
||||||
comment = "";
|
comment = "";
|
||||||
} else {
|
} else {
|
||||||
int index = line.indexOf(";");
|
int index = line.indexOf(";");
|
||||||
bitName = line.substring(0, index);
|
bitName = line.substring(0, index);
|
||||||
comment = line.substring(index + 1);
|
comment = line.substring(index + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
ConfigField bitField = new ConfigField(bitName, comment, true, null, null, 0, null, false);
|
ConfigField bitField = new ConfigField(bitName, comment, true, null, null, 0, null, false);
|
||||||
stack.peek().addBoth(bitField);
|
stack.peek().addBoth(bitField);
|
||||||
|
|
||||||
} else if (startsWithToken(line, CUSTOM)) {
|
} else if (startsWithToken(line, CUSTOM)) {
|
||||||
line = line.substring(CUSTOM.length() + 1).trim();
|
line = line.substring(CUSTOM.length() + 1).trim();
|
||||||
int index = line.indexOf(' ');
|
int index = line.indexOf(' ');
|
||||||
String name = line.substring(0, index);
|
String name = line.substring(0, index);
|
||||||
line = line.substring(index).trim();
|
line = line.substring(index).trim();
|
||||||
index = line.indexOf(' ');
|
index = line.indexOf(' ');
|
||||||
String customSize = line.substring(0, index);
|
String customSize = line.substring(0, index);
|
||||||
|
|
||||||
String tunerStudioLine = line.substring(index).trim();
|
String tunerStudioLine = line.substring(index).trim();
|
||||||
tunerStudioLine = VariableRegistry.INSTANCE.processLine(tunerStudioLine);
|
tunerStudioLine = VariableRegistry.INSTANCE.processLine(tunerStudioLine);
|
||||||
int size;
|
int size;
|
||||||
try {
|
try {
|
||||||
size = Integer.parseInt(customSize);
|
size = Integer.parseInt(customSize);
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
throw new IllegalStateException("Size in " + line);
|
throw new IllegalStateException("Size in " + line);
|
||||||
}
|
}
|
||||||
tsCustomSize.put(name, size);
|
tsCustomSize.put(name, size);
|
||||||
tsCustomLine.put(name, tunerStudioLine);
|
tsCustomLine.put(name, tunerStudioLine);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
processLine(line);
|
processLine(line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cHeader.write("#endif\r\n");
|
cHeader.write("#endif\r\n");
|
||||||
cHeader.write("// end\r\n");
|
cHeader.write("// end\r\n");
|
||||||
cHeader.write(message);
|
cHeader.write(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean startsWithToken(String line, String token) {
|
private static boolean startsWithToken(String line, String token) {
|
||||||
return line.startsWith(token + " ") || line.startsWith(token + "\t");
|
return line.startsWith(token + " ") || line.startsWith(token + "\t");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void handleStartStructure(String line, boolean withPrefix) {
|
private static void handleStartStructure(String line, boolean withPrefix) {
|
||||||
String name;
|
String name;
|
||||||
String comment;
|
String comment;
|
||||||
if (line.contains(" ")) {
|
if (line.contains(" ")) {
|
||||||
int index = line.indexOf(' ');
|
int index = line.indexOf(' ');
|
||||||
name = line.substring(0, index);
|
name = line.substring(0, index);
|
||||||
comment = line.substring(index + 1).trim();
|
comment = line.substring(index + 1).trim();
|
||||||
} else {
|
} else {
|
||||||
name = line;
|
name = line;
|
||||||
comment = null;
|
comment = null;
|
||||||
}
|
}
|
||||||
ConfigStructure structure = new ConfigStructure(name, comment, withPrefix);
|
ConfigStructure structure = new ConfigStructure(name, comment, withPrefix);
|
||||||
stack.push(structure);
|
stack.push(structure);
|
||||||
System.out.println("Starting structure " + structure.name);
|
System.out.println("Starting structure " + structure.name);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void handleEndStruct(Writer cHeader, Writer tsHeader, CharArrayWriter javaFieldsWriter) throws IOException {
|
private static void handleEndStruct(Writer cHeader, Writer tsHeader, CharArrayWriter javaFieldsWriter) throws IOException {
|
||||||
if (stack.isEmpty())
|
if (stack.isEmpty())
|
||||||
throw new IllegalStateException("Unexpected end_struct");
|
throw new IllegalStateException("Unexpected end_struct");
|
||||||
ConfigStructure structure = stack.pop();
|
ConfigStructure structure = stack.pop();
|
||||||
System.out.println("Ending structure " + structure.name);
|
System.out.println("Ending structure " + structure.name);
|
||||||
structure.addAlignmentFill();
|
structure.addAlignmentFill();
|
||||||
|
|
||||||
ConfigDefinition.structures.put(structure.name, structure);
|
ConfigDefinition.structures.put(structure.name, structure);
|
||||||
|
|
||||||
structure.headerWrite(cHeader);
|
structure.headerWrite(cHeader);
|
||||||
|
|
||||||
if (stack.isEmpty()) {
|
if (stack.isEmpty()) {
|
||||||
totalTsSize = structure.writeTunerStudio("", tsHeader, 0);
|
totalTsSize = structure.writeTunerStudio("", tsHeader, 0);
|
||||||
tsHeader.write("; total TS size = " + totalTsSize + "\r\n");
|
tsHeader.write("; total TS size = " + totalTsSize + "\r\n");
|
||||||
VariableRegistry.INSTANCE.register("TOTAL_CONFIG_SIZE", totalTsSize);
|
VariableRegistry.INSTANCE.register("TOTAL_CONFIG_SIZE", totalTsSize);
|
||||||
|
|
||||||
structure.writeJavaFields("", javaFieldsWriter, 0);
|
structure.writeJavaFields("", javaFieldsWriter, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void processLine(String line) throws IOException {
|
private static void processLine(String line) throws IOException {
|
||||||
/**
|
/**
|
||||||
* for example
|
* for example
|
||||||
* #define CLT_CURVE_SIZE 16
|
* #define CLT_CURVE_SIZE 16
|
||||||
*/
|
*/
|
||||||
if (startsWithToken(line, DEFINE)) {
|
if (startsWithToken(line, DEFINE)) {
|
||||||
processDefine(line.substring(DEFINE.length()).trim());
|
processDefine(line.substring(DEFINE.length()).trim());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ConfigField cf = ConfigField.parse(line);
|
ConfigField cf = ConfigField.parse(line);
|
||||||
if (cf == null)
|
if (cf == null)
|
||||||
throw new IllegalStateException("Cannot parse line [" + line + "]");
|
throw new IllegalStateException("Cannot parse line [" + line + "]");
|
||||||
|
|
||||||
if (stack.isEmpty())
|
if (stack.isEmpty())
|
||||||
throw new IllegalStateException(cf.name + ": Not enclosed in a struct");
|
throw new IllegalStateException(cf.name + ": Not enclosed in a struct");
|
||||||
ConfigStructure structure = stack.peek();
|
ConfigStructure structure = stack.peek();
|
||||||
|
|
||||||
if (cf.isIterate) {
|
if (cf.isIterate) {
|
||||||
structure.addC(cf);
|
structure.addC(cf);
|
||||||
for (int i = 1; i <= cf.arraySize; i++) {
|
for (int i = 1; i <= cf.arraySize; i++) {
|
||||||
ConfigField element = new ConfigField(cf.name + i, cf.comment, false, null,
|
ConfigField element = new ConfigField(cf.name + i, cf.comment, false, null,
|
||||||
cf.type, 1, cf.tsInfo, false);
|
cf.type, 1, cf.tsInfo, false);
|
||||||
structure.addTs(element);
|
structure.addTs(element);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
structure.addBoth(cf);
|
structure.addBoth(cf);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getComment(String comment, int currentOffset) {
|
public static String getComment(String comment, int currentOffset) {
|
||||||
return "\t/**\r\n" + packComment(comment, "\t") + "\t * offset " + currentOffset + "\r\n\t */\r\n";
|
return "\t/**\r\n" + packComment(comment, "\t") + "\t * offset " + currentOffset + "\r\n\t */\r\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String packComment(String comment, String linePrefix) {
|
public static String packComment(String comment, String linePrefix) {
|
||||||
if (comment == null)
|
if (comment == null)
|
||||||
return "";
|
return "";
|
||||||
if (comment.trim().isEmpty())
|
if (comment.trim().isEmpty())
|
||||||
return "";
|
return "";
|
||||||
String result = "";
|
String result = "";
|
||||||
for (String line : comment.split("\\\\n")) {
|
for (String line : comment.split("\\\\n")) {
|
||||||
result += linePrefix + " * " + line + "\r\n";
|
result += linePrefix + " * " + line + "\r\n";
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getSize(String s) {
|
public static int getSize(String s) {
|
||||||
if (VariableRegistry.INSTANCE.intValues.containsKey(s))
|
if (VariableRegistry.INSTANCE.intValues.containsKey(s))
|
||||||
return VariableRegistry.INSTANCE.intValues.get(s);
|
return VariableRegistry.INSTANCE.intValues.get(s);
|
||||||
return Integer.parseInt(s);
|
return Integer.parseInt(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void processDefine(String line) {
|
private static void processDefine(String line) {
|
||||||
int index = line.indexOf(' ');
|
int index = line.indexOf(' ');
|
||||||
String name;
|
String name;
|
||||||
if (index == -1) {
|
if (index == -1) {
|
||||||
name = line;
|
name = line;
|
||||||
line = "";
|
line = "";
|
||||||
} else {
|
} else {
|
||||||
name = line.substring(0, index);
|
name = line.substring(0, index);
|
||||||
line = line.substring(index).trim();
|
line = line.substring(index).trim();
|
||||||
}
|
}
|
||||||
VariableRegistry.INSTANCE.register(name, line);
|
VariableRegistry.INSTANCE.register(name, line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,257 +1,257 @@
|
||||||
package com.rusefi;
|
package com.rusefi;
|
||||||
|
|
||||||
import com.rusefi.test.ConfigDefinitionTest;
|
import com.rusefi.test.ConfigDefinitionTest;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.Writer;
|
import java.io.Writer;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is an immutable model of an individual field
|
* This is an immutable model of an individual field
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 1/15/15
|
* 1/15/15
|
||||||
*/
|
*/
|
||||||
public class ConfigField {
|
public class ConfigField {
|
||||||
public static final ConfigField VOID = new ConfigField(null, null, false, null, null, 1, null, false);
|
public static final ConfigField VOID = new ConfigField(null, null, false, null, null, 1, null, false);
|
||||||
|
|
||||||
private static final String typePattern = "([\\w\\d_]+)(\\[([\\w\\d]+)(\\s([\\w\\d]+))?\\])?";
|
private static final String typePattern = "([\\w\\d_]+)(\\[([\\w\\d]+)(\\s([\\w\\d]+))?\\])?";
|
||||||
private static final String namePattern = "[[\\w\\d\\s_]]+";
|
private static final String namePattern = "[[\\w\\d\\s_]]+";
|
||||||
private static final String commentPattern = ";([^;]*)";
|
private static final String commentPattern = ";([^;]*)";
|
||||||
|
|
||||||
private static final Pattern FIELD = Pattern.compile(typePattern + "\\s(" + namePattern + ")(" + commentPattern + ")?(;(.*))?");
|
private static final Pattern FIELD = Pattern.compile(typePattern + "\\s(" + namePattern + ")(" + commentPattern + ")?(;(.*))?");
|
||||||
private static final Set<String> javaEnums = new HashSet<>();
|
private static final Set<String> javaEnums = new HashSet<>();
|
||||||
private static final String BOOLEAN_TYPE = "bool";
|
private static final String BOOLEAN_TYPE = "bool";
|
||||||
|
|
||||||
public static final int LENGTH = 24;
|
public static final int LENGTH = 24;
|
||||||
private static final char TS_COMMENT_TAG = '+';
|
private static final char TS_COMMENT_TAG = '+';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* field name without structure name
|
* field name without structure name
|
||||||
* @see #writeJavaFields prefix parameter for structure name
|
* @see #writeJavaFields prefix parameter for structure name
|
||||||
*/
|
*/
|
||||||
public final String name;
|
public final String name;
|
||||||
public final String comment;
|
public final String comment;
|
||||||
public final boolean isBit;
|
public final boolean isBit;
|
||||||
public final String arraySizeAsText;
|
public final String arraySizeAsText;
|
||||||
public final String type;
|
public final String type;
|
||||||
public final int arraySize;
|
public final int arraySize;
|
||||||
|
|
||||||
public final String tsInfo;
|
public final String tsInfo;
|
||||||
public final int elementSize;
|
public final int elementSize;
|
||||||
/**
|
/**
|
||||||
* this property of array expands field into a bunch of variables like field1 field2 field3 etc
|
* this property of array expands field into a bunch of variables like field1 field2 field3 etc
|
||||||
*/
|
*/
|
||||||
public final boolean isIterate;
|
public final boolean isIterate;
|
||||||
|
|
||||||
public ConfigField(String name, String comment, boolean isBit, String arraySizeAsText, String type,
|
public ConfigField(String name, String comment, boolean isBit, String arraySizeAsText, String type,
|
||||||
int arraySize, String tsInfo, boolean isIterate) {
|
int arraySize, String tsInfo, boolean isIterate) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.comment = comment;
|
this.comment = comment;
|
||||||
this.isBit = isBit;
|
this.isBit = isBit;
|
||||||
this.arraySizeAsText = arraySizeAsText;
|
this.arraySizeAsText = arraySizeAsText;
|
||||||
this.type = type;
|
this.type = type;
|
||||||
if (type == null) {
|
if (type == null) {
|
||||||
elementSize = 0;
|
elementSize = 0;
|
||||||
} else {
|
} else {
|
||||||
elementSize = TypesHelper.getElementSize(type);
|
elementSize = TypesHelper.getElementSize(type);
|
||||||
}
|
}
|
||||||
this.arraySize = arraySize;
|
this.arraySize = arraySize;
|
||||||
this.tsInfo = tsInfo;
|
this.tsInfo = tsInfo;
|
||||||
this.isIterate = isIterate;
|
this.isIterate = isIterate;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see ConfigDefinitionTest#testParseLine()
|
* @see ConfigDefinitionTest#testParseLine()
|
||||||
*/
|
*/
|
||||||
public static ConfigField parse(String line) {
|
public static ConfigField parse(String line) {
|
||||||
Matcher matcher = FIELD.matcher(line);
|
Matcher matcher = FIELD.matcher(line);
|
||||||
if (!matcher.matches())
|
if (!matcher.matches())
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
String name = matcher.group(6);
|
String name = matcher.group(6);
|
||||||
String comment = matcher.group(8);
|
String comment = matcher.group(8);
|
||||||
String type = matcher.group(1);
|
String type = matcher.group(1);
|
||||||
int arraySize;
|
int arraySize;
|
||||||
String arraySizeAsText;
|
String arraySizeAsText;
|
||||||
if (matcher.group(3) != null) {
|
if (matcher.group(3) != null) {
|
||||||
arraySizeAsText = matcher.group(3);
|
arraySizeAsText = matcher.group(3);
|
||||||
arraySize = ConfigDefinition.getSize(arraySizeAsText);
|
arraySize = ConfigDefinition.getSize(arraySizeAsText);
|
||||||
} else {
|
} else {
|
||||||
arraySize = 1;
|
arraySize = 1;
|
||||||
arraySizeAsText = null;
|
arraySizeAsText = null;
|
||||||
}
|
}
|
||||||
String tsInfo = matcher.group(10);
|
String tsInfo = matcher.group(10);
|
||||||
|
|
||||||
boolean isIterate = "iterate".equalsIgnoreCase(matcher.group(5));
|
boolean isIterate = "iterate".equalsIgnoreCase(matcher.group(5));
|
||||||
ConfigField field = new ConfigField(name, comment, false, arraySizeAsText, type, arraySize,
|
ConfigField field = new ConfigField(name, comment, false, arraySizeAsText, type, arraySize,
|
||||||
tsInfo, isIterate);
|
tsInfo, isIterate);
|
||||||
System.out.println("type " + type);
|
System.out.println("type " + type);
|
||||||
System.out.println("name " + name);
|
System.out.println("name " + name);
|
||||||
System.out.println("comment " + comment);
|
System.out.println("comment " + comment);
|
||||||
|
|
||||||
return field;
|
return field;
|
||||||
}
|
}
|
||||||
|
|
||||||
int getSize(ConfigField next) {
|
int getSize(ConfigField next) {
|
||||||
if (isBit && next.isBit)
|
if (isBit && next.isBit)
|
||||||
return 0;
|
return 0;
|
||||||
if (isBit)
|
if (isBit)
|
||||||
return 4;
|
return 4;
|
||||||
return elementSize * arraySize;
|
return elementSize * arraySize;
|
||||||
}
|
}
|
||||||
|
|
||||||
String getHeaderText(int currentOffset, int bitIndex) {
|
String getHeaderText(int currentOffset, int bitIndex) {
|
||||||
if (isBit) {
|
if (isBit) {
|
||||||
String comment = "\t/**\r\n" + ConfigDefinition.packComment(getCommentContent(), "\t") + "\toffset " + currentOffset + " bit " + bitIndex + " */\r\n";
|
String comment = "\t/**\r\n" + ConfigDefinition.packComment(getCommentContent(), "\t") + "\toffset " + currentOffset + " bit " + bitIndex + " */\r\n";
|
||||||
return comment + "\t" + BOOLEAN_TYPE + " " + name + " : 1;\r\n";
|
return comment + "\t" + BOOLEAN_TYPE + " " + name + " : 1;\r\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
String cEntry = ConfigDefinition.getComment(getCommentContent(), currentOffset);
|
String cEntry = ConfigDefinition.getComment(getCommentContent(), currentOffset);
|
||||||
|
|
||||||
if (arraySize == 1) {
|
if (arraySize == 1) {
|
||||||
// not an array
|
// not an array
|
||||||
cEntry += "\t" + type + " " + name + ";\r\n";
|
cEntry += "\t" + type + " " + name + ";\r\n";
|
||||||
} else {
|
} else {
|
||||||
cEntry += "\t" + type + " " + name + "[" + arraySizeAsText + "];\n";
|
cEntry += "\t" + type + " " + name + "[" + arraySizeAsText + "];\n";
|
||||||
}
|
}
|
||||||
return cEntry;
|
return cEntry;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "ConfigField{" +
|
return "ConfigField{" +
|
||||||
"name='" + name + '\'' +
|
"name='" + name + '\'' +
|
||||||
", type='" + type + '\'' +
|
", type='" + type + '\'' +
|
||||||
", arraySize=" + arraySize +
|
", arraySize=" + arraySize +
|
||||||
", elementSize=" + elementSize +
|
", elementSize=" + elementSize +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
|
|
||||||
public int writeTunerStudio(String prefix, Writer tsHeader, int tsPosition, ConfigField next, int bitIndex) throws IOException {
|
public int writeTunerStudio(String prefix, Writer tsHeader, int tsPosition, ConfigField next, int bitIndex) throws IOException {
|
||||||
String nameWithPrefix = prefix + name;
|
String nameWithPrefix = prefix + name;
|
||||||
|
|
||||||
VariableRegistry.INSTANCE.register(nameWithPrefix + "_offset", tsPosition);
|
VariableRegistry.INSTANCE.register(nameWithPrefix + "_offset", tsPosition);
|
||||||
|
|
||||||
ConfigStructure cs = ConfigDefinition.structures.get(type);
|
ConfigStructure cs = ConfigDefinition.structures.get(type);
|
||||||
if (cs != null) {
|
if (cs != null) {
|
||||||
String extraPrefix = cs.withPrefix ? name + "_" : "";
|
String extraPrefix = cs.withPrefix ? name + "_" : "";
|
||||||
return cs.writeTunerStudio(prefix + extraPrefix, tsHeader, tsPosition);
|
return cs.writeTunerStudio(prefix + extraPrefix, tsHeader, tsPosition);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isBit) {
|
if (isBit) {
|
||||||
tsHeader.write("\t" + addTabsUpTo(nameWithPrefix, LENGTH));
|
tsHeader.write("\t" + addTabsUpTo(nameWithPrefix, LENGTH));
|
||||||
tsHeader.write("= bits, U32, ");
|
tsHeader.write("= bits, U32, ");
|
||||||
tsHeader.write("\t" + tsPosition + ", [");
|
tsHeader.write("\t" + tsPosition + ", [");
|
||||||
tsHeader.write(bitIndex + ":" + bitIndex);
|
tsHeader.write(bitIndex + ":" + bitIndex);
|
||||||
tsHeader.write("], \"false\", \"true\"");
|
tsHeader.write("], \"false\", \"true\"");
|
||||||
tsHeader.write("\r\n");
|
tsHeader.write("\r\n");
|
||||||
|
|
||||||
tsPosition += getSize(next);
|
tsPosition += getSize(next);
|
||||||
return tsPosition;
|
return tsPosition;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ConfigDefinition.tsCustomLine.containsKey(type)) {
|
if (ConfigDefinition.tsCustomLine.containsKey(type)) {
|
||||||
String bits = ConfigDefinition.tsCustomLine.get(type);
|
String bits = ConfigDefinition.tsCustomLine.get(type);
|
||||||
tsHeader.write("\t" + addTabsUpTo(nameWithPrefix, LENGTH));
|
tsHeader.write("\t" + addTabsUpTo(nameWithPrefix, LENGTH));
|
||||||
int size = ConfigDefinition.tsCustomSize.get(type);
|
int size = ConfigDefinition.tsCustomSize.get(type);
|
||||||
// tsHeader.headerWrite("\t" + size + ",");
|
// tsHeader.headerWrite("\t" + size + ",");
|
||||||
// tsHeader.headerWrite("\t" + tsPosition + ",");
|
// tsHeader.headerWrite("\t" + tsPosition + ",");
|
||||||
bits = bits.replaceAll("@OFFSET@", "" + tsPosition);
|
bits = bits.replaceAll("@OFFSET@", "" + tsPosition);
|
||||||
tsHeader.write("\t = " + bits);
|
tsHeader.write("\t = " + bits);
|
||||||
|
|
||||||
tsPosition += size;
|
tsPosition += size;
|
||||||
} else if (tsInfo == null) {
|
} else if (tsInfo == null) {
|
||||||
tsHeader.write(";skipping " + prefix + name + " offset " + tsPosition);
|
tsHeader.write(";skipping " + prefix + name + " offset " + tsPosition);
|
||||||
tsPosition += arraySize * elementSize;
|
tsPosition += arraySize * elementSize;
|
||||||
} else if (arraySize != 1) {
|
} else if (arraySize != 1) {
|
||||||
tsHeader.write("\t" + addTabsUpTo(nameWithPrefix, LENGTH) + "\t\t= array, ");
|
tsHeader.write("\t" + addTabsUpTo(nameWithPrefix, LENGTH) + "\t\t= array, ");
|
||||||
tsHeader.write(TypesHelper.convertToTs(type) + ",");
|
tsHeader.write(TypesHelper.convertToTs(type) + ",");
|
||||||
tsHeader.write("\t" + tsPosition + ",");
|
tsHeader.write("\t" + tsPosition + ",");
|
||||||
tsHeader.write("\t[" + arraySize + "],");
|
tsHeader.write("\t[" + arraySize + "],");
|
||||||
tsHeader.write("\t" + tsInfo);
|
tsHeader.write("\t" + tsInfo);
|
||||||
|
|
||||||
tsPosition += arraySize * elementSize;
|
tsPosition += arraySize * elementSize;
|
||||||
} else {
|
} else {
|
||||||
tsHeader.write("\t" + addTabsUpTo(nameWithPrefix, LENGTH) + "\t\t= scalar, ");
|
tsHeader.write("\t" + addTabsUpTo(nameWithPrefix, LENGTH) + "\t\t= scalar, ");
|
||||||
tsHeader.write(TypesHelper.convertToTs(type) + ",");
|
tsHeader.write(TypesHelper.convertToTs(type) + ",");
|
||||||
tsHeader.write("\t" + tsPosition + ",");
|
tsHeader.write("\t" + tsPosition + ",");
|
||||||
tsHeader.write("\t" + tsInfo);
|
tsHeader.write("\t" + tsInfo);
|
||||||
tsPosition += arraySize * elementSize;
|
tsPosition += arraySize * elementSize;
|
||||||
}
|
}
|
||||||
tsHeader.write("\r\n");
|
tsHeader.write("\r\n");
|
||||||
return tsPosition;
|
return tsPosition;
|
||||||
}
|
}
|
||||||
|
|
||||||
private String addTabsUpTo(String name, int length) {
|
private String addTabsUpTo(String name, int length) {
|
||||||
StringBuilder result = new StringBuilder(name);
|
StringBuilder result = new StringBuilder(name);
|
||||||
int currentLength = name.length();
|
int currentLength = name.length();
|
||||||
while (currentLength < length) {
|
while (currentLength < length) {
|
||||||
result.append("\t");
|
result.append("\t");
|
||||||
currentLength += 4;
|
currentLength += 4;
|
||||||
}
|
}
|
||||||
return result.toString();
|
return result.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int writeJavaFields(String prefix, Writer javaFieldsWriter, int tsPosition, ConfigField next, int bitIndex) throws IOException {
|
public int writeJavaFields(String prefix, Writer javaFieldsWriter, int tsPosition, ConfigField next, int bitIndex) throws IOException {
|
||||||
ConfigStructure cs = ConfigDefinition.structures.get(type);
|
ConfigStructure cs = ConfigDefinition.structures.get(type);
|
||||||
if (cs != null) {
|
if (cs != null) {
|
||||||
String extraPrefix = cs.withPrefix ? name + "_" : "";
|
String extraPrefix = cs.withPrefix ? name + "_" : "";
|
||||||
return cs.writeJavaFields(prefix + extraPrefix, javaFieldsWriter, tsPosition);
|
return cs.writeJavaFields(prefix + extraPrefix, javaFieldsWriter, tsPosition);
|
||||||
}
|
}
|
||||||
|
|
||||||
String nameWithPrefix = prefix + name;
|
String nameWithPrefix = prefix + name;
|
||||||
|
|
||||||
if (comment != null && comment.startsWith(TS_COMMENT_TAG + "")) {
|
if (comment != null && comment.startsWith(TS_COMMENT_TAG + "")) {
|
||||||
ConfigDefinition.settingContextHelp.append("\t" + nameWithPrefix + " = \"" + getCommentContent() + "\"\r\n");
|
ConfigDefinition.settingContextHelp.append("\t" + nameWithPrefix + " = \"" + getCommentContent() + "\"\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isBit) {
|
if (isBit) {
|
||||||
writeJavaFieldName(javaFieldsWriter, nameWithPrefix, tsPosition);
|
writeJavaFieldName(javaFieldsWriter, nameWithPrefix, tsPosition);
|
||||||
javaFieldsWriter.append("FieldType.BIT, " + bitIndex + ");\r\n");
|
javaFieldsWriter.append("FieldType.BIT, " + bitIndex + ");\r\n");
|
||||||
tsPosition += getSize(next);
|
tsPosition += getSize(next);
|
||||||
return tsPosition;
|
return tsPosition;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (arraySize != 1) {
|
if (arraySize != 1) {
|
||||||
// todo: array support
|
// todo: array support
|
||||||
} else if (TypesHelper.isFloat(type)) {
|
} else if (TypesHelper.isFloat(type)) {
|
||||||
writeJavaFieldName(javaFieldsWriter, nameWithPrefix, tsPosition);
|
writeJavaFieldName(javaFieldsWriter, nameWithPrefix, tsPosition);
|
||||||
javaFieldsWriter.write("FieldType.FLOAT);\r\n");
|
javaFieldsWriter.write("FieldType.FLOAT);\r\n");
|
||||||
} else {
|
} else {
|
||||||
String enumOptions = VariableRegistry.INSTANCE.get(type + "_enum");
|
String enumOptions = VariableRegistry.INSTANCE.get(type + "_enum");
|
||||||
|
|
||||||
if (enumOptions != null && !javaEnums.contains(type)) {
|
if (enumOptions != null && !javaEnums.contains(type)) {
|
||||||
javaEnums.add(type);
|
javaEnums.add(type);
|
||||||
javaFieldsWriter.write("\tpublic static final String[] " + type + " = {" + enumOptions + "};\r\n");
|
javaFieldsWriter.write("\tpublic static final String[] " + type + " = {" + enumOptions + "};\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
writeJavaFieldName(javaFieldsWriter, nameWithPrefix, tsPosition);
|
writeJavaFieldName(javaFieldsWriter, nameWithPrefix, tsPosition);
|
||||||
javaFieldsWriter.write("FieldType.INT");
|
javaFieldsWriter.write("FieldType.INT");
|
||||||
if (enumOptions != null) {
|
if (enumOptions != null) {
|
||||||
javaFieldsWriter.write(", " + type);
|
javaFieldsWriter.write(", " + type);
|
||||||
}
|
}
|
||||||
javaFieldsWriter.write(");\r\n");
|
javaFieldsWriter.write(");\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
tsPosition += arraySize * elementSize;
|
tsPosition += arraySize * elementSize;
|
||||||
|
|
||||||
return tsPosition;
|
return tsPosition;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void writeJavaFieldName(Writer javaFieldsWriter, String nameWithPrefix, int tsPosition) throws IOException {
|
private void writeJavaFieldName(Writer javaFieldsWriter, String nameWithPrefix, int tsPosition) throws IOException {
|
||||||
javaFieldsWriter.write("\tpublic static final Field ");
|
javaFieldsWriter.write("\tpublic static final Field ");
|
||||||
javaFieldsWriter.write(nameWithPrefix.toUpperCase());
|
javaFieldsWriter.write(nameWithPrefix.toUpperCase());
|
||||||
javaFieldsWriter.write(" = Field.create(\"" + nameWithPrefix.toUpperCase() + "\", "
|
javaFieldsWriter.write(" = Field.create(\"" + nameWithPrefix.toUpperCase() + "\", "
|
||||||
+ tsPosition + ", ");
|
+ tsPosition + ", ");
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getCommentContent() {
|
public String getCommentContent() {
|
||||||
if (comment == null || comment.isEmpty())
|
if (comment == null || comment.isEmpty())
|
||||||
return comment;
|
return comment;
|
||||||
return comment.charAt(0) == TS_COMMENT_TAG ? comment.substring(1) : comment;
|
return comment.charAt(0) == TS_COMMENT_TAG ? comment.substring(1) : comment;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,117 +1,117 @@
|
||||||
package com.rusefi;
|
package com.rusefi;
|
||||||
|
|
||||||
import java.io.CharArrayWriter;
|
import java.io.CharArrayWriter;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.Writer;
|
import java.io.Writer;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 1/15/15
|
* 1/15/15
|
||||||
*/
|
*/
|
||||||
public class ConfigStructure {
|
public class ConfigStructure {
|
||||||
public static final String UINT8_T = "uint8_t";
|
public static final String UINT8_T = "uint8_t";
|
||||||
public final String name;
|
public final String name;
|
||||||
private final String comment;
|
private final String comment;
|
||||||
public final boolean withPrefix;
|
public final boolean withPrefix;
|
||||||
/**
|
/**
|
||||||
* We have two different collections because if 'array iterate' feature which is handled differently
|
* We have two different collections because if 'array iterate' feature which is handled differently
|
||||||
* in C and TS
|
* in C and TS
|
||||||
*/
|
*/
|
||||||
private final List<ConfigField> cFields = new ArrayList<>();
|
private final List<ConfigField> cFields = new ArrayList<>();
|
||||||
private final List<ConfigField> tsFields = new ArrayList<>();
|
private final List<ConfigField> tsFields = new ArrayList<>();
|
||||||
private int currentOffset;
|
private int currentOffset;
|
||||||
public int totalSize;
|
public int totalSize;
|
||||||
BitState bitState = new BitState();
|
BitState bitState = new BitState();
|
||||||
|
|
||||||
public ConfigStructure(String name, String comment, boolean withPrefix) {
|
public ConfigStructure(String name, String comment, boolean withPrefix) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.comment = comment;
|
this.comment = comment;
|
||||||
this.withPrefix = withPrefix;
|
this.withPrefix = withPrefix;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addAlignmentFill() {
|
public void addAlignmentFill() {
|
||||||
bitState.reset();
|
bitState.reset();
|
||||||
/**
|
/**
|
||||||
* we make alignment decision based on C fields since we expect interation and non-iteration fields
|
* we make alignment decision based on C fields since we expect interation and non-iteration fields
|
||||||
* to match in size
|
* to match in size
|
||||||
*/
|
*/
|
||||||
for (int i = 0; i < cFields.size(); i++) {
|
for (int i = 0; i < cFields.size(); i++) {
|
||||||
ConfigField cf = cFields.get(i);
|
ConfigField cf = cFields.get(i);
|
||||||
ConfigField next = i == cFields.size() - 1 ? ConfigField.VOID : cFields.get(i + 1);
|
ConfigField next = i == cFields.size() - 1 ? ConfigField.VOID : cFields.get(i + 1);
|
||||||
bitState.incrementBitIndex(cf, next);
|
bitState.incrementBitIndex(cf, next);
|
||||||
totalSize += cf.getSize(next);
|
totalSize += cf.getSize(next);
|
||||||
}
|
}
|
||||||
|
|
||||||
int fillSize = totalSize % 4 == 0 ? 0 : 4 - (totalSize % 4);
|
int fillSize = totalSize % 4 == 0 ? 0 : 4 - (totalSize % 4);
|
||||||
|
|
||||||
if (fillSize != 0) {
|
if (fillSize != 0) {
|
||||||
ConfigField fill = new ConfigField("alignmentFill", "need 4 byte alignment", false,
|
ConfigField fill = new ConfigField("alignmentFill", "need 4 byte alignment", false,
|
||||||
"" + fillSize,
|
"" + fillSize,
|
||||||
UINT8_T, fillSize, null, false);
|
UINT8_T, fillSize, null, false);
|
||||||
addBoth(fill);
|
addBoth(fill);
|
||||||
}
|
}
|
||||||
totalSize += fillSize;
|
totalSize += fillSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method writes a C header version of a data structure
|
* This method writes a C header version of a data structure
|
||||||
*/
|
*/
|
||||||
public void headerWrite(Writer cHeader) throws IOException {
|
public void headerWrite(Writer cHeader) throws IOException {
|
||||||
if (comment != null) {
|
if (comment != null) {
|
||||||
cHeader.write("/**\r\n" + ConfigDefinition.packComment(comment, "") + "\r\n*/\r\n");
|
cHeader.write("/**\r\n" + ConfigDefinition.packComment(comment, "") + "\r\n*/\r\n");
|
||||||
}
|
}
|
||||||
cHeader.write("typedef struct {\r\n");
|
cHeader.write("typedef struct {\r\n");
|
||||||
|
|
||||||
bitState.reset();
|
bitState.reset();
|
||||||
for (int i = 0; i < cFields.size(); i++) {
|
for (int i = 0; i < cFields.size(); i++) {
|
||||||
ConfigField cf = cFields.get(i);
|
ConfigField cf = cFields.get(i);
|
||||||
cHeader.write(cf.getHeaderText(currentOffset, bitState.get()));
|
cHeader.write(cf.getHeaderText(currentOffset, bitState.get()));
|
||||||
ConfigField next = i == cFields.size() - 1 ? ConfigField.VOID : cFields.get(i + 1);
|
ConfigField next = i == cFields.size() - 1 ? ConfigField.VOID : cFields.get(i + 1);
|
||||||
|
|
||||||
bitState.incrementBitIndex(cf, next);
|
bitState.incrementBitIndex(cf, next);
|
||||||
currentOffset += cf.getSize(next);
|
currentOffset += cf.getSize(next);
|
||||||
}
|
}
|
||||||
|
|
||||||
cHeader.write("\t/** total size " + currentOffset + "*/\r\n");
|
cHeader.write("\t/** total size " + currentOffset + "*/\r\n");
|
||||||
cHeader.write("} " + name + ";\r\n\r\n");
|
cHeader.write("} " + name + ";\r\n\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
public int writeTunerStudio(String prefix, Writer tsHeader, int tsPosition) throws IOException {
|
public int writeTunerStudio(String prefix, Writer tsHeader, int tsPosition) throws IOException {
|
||||||
FieldIterator fieldIterator = new FieldIterator();
|
FieldIterator fieldIterator = new FieldIterator();
|
||||||
for (int i = 0; i < tsFields.size(); i++) {
|
for (int i = 0; i < tsFields.size(); i++) {
|
||||||
ConfigField next = i == tsFields.size() - 1 ? ConfigField.VOID : tsFields.get(i + 1);
|
ConfigField next = i == tsFields.size() - 1 ? ConfigField.VOID : tsFields.get(i + 1);
|
||||||
ConfigField cf = tsFields.get(i);
|
ConfigField cf = tsFields.get(i);
|
||||||
tsPosition = cf.writeTunerStudio(prefix, tsHeader, tsPosition, next, fieldIterator.bitState.get());
|
tsPosition = cf.writeTunerStudio(prefix, tsHeader, tsPosition, next, fieldIterator.bitState.get());
|
||||||
|
|
||||||
fieldIterator.bitState.incrementBitIndex(cf, next);
|
fieldIterator.bitState.incrementBitIndex(cf, next);
|
||||||
}
|
}
|
||||||
return tsPosition;
|
return tsPosition;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int writeJavaFields(String prefix, Writer javaFieldsWriter, int tsPosition) throws IOException {
|
public int writeJavaFields(String prefix, Writer javaFieldsWriter, int tsPosition) throws IOException {
|
||||||
FieldIterator fieldIterator = new FieldIterator();
|
FieldIterator fieldIterator = new FieldIterator();
|
||||||
for (int i = 0; i < tsFields.size(); i++) {
|
for (int i = 0; i < tsFields.size(); i++) {
|
||||||
ConfigField next = i == tsFields.size() - 1 ? ConfigField.VOID : tsFields.get(i + 1);
|
ConfigField next = i == tsFields.size() - 1 ? ConfigField.VOID : tsFields.get(i + 1);
|
||||||
ConfigField cf = tsFields.get(i);
|
ConfigField cf = tsFields.get(i);
|
||||||
tsPosition = cf.writeJavaFields(prefix, javaFieldsWriter, tsPosition, next, fieldIterator.bitState.get());
|
tsPosition = cf.writeJavaFields(prefix, javaFieldsWriter, tsPosition, next, fieldIterator.bitState.get());
|
||||||
|
|
||||||
fieldIterator.bitState.incrementBitIndex(cf, next);
|
fieldIterator.bitState.incrementBitIndex(cf, next);
|
||||||
}
|
}
|
||||||
return tsPosition;
|
return tsPosition;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addBoth(ConfigField cf) {
|
public void addBoth(ConfigField cf) {
|
||||||
cFields.add(cf);
|
cFields.add(cf);
|
||||||
tsFields.add(cf);
|
tsFields.add(cf);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addC(ConfigField cf) {
|
public void addC(ConfigField cf) {
|
||||||
cFields.add(cf);
|
cFields.add(cf);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addTs(ConfigField cf) {
|
public void addTs(ConfigField cf) {
|
||||||
tsFields.add(cf);
|
tsFields.add(cf);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
package com.rusefi;
|
package com.rusefi;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 6/4/2015.
|
* 6/4/2015.
|
||||||
*/
|
*/
|
||||||
public class FieldIterator {
|
public class FieldIterator {
|
||||||
public BitState bitState = new BitState();
|
public BitState bitState = new BitState();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,22 @@
|
||||||
package com.rusefi;
|
package com.rusefi;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 1/31/2015
|
* 1/31/2015
|
||||||
*/
|
*/
|
||||||
public class TsFileContent {
|
public class TsFileContent {
|
||||||
private final String prefix;
|
private final String prefix;
|
||||||
private final String postfix;
|
private final String postfix;
|
||||||
|
|
||||||
public TsFileContent(String prefix, String postfix) {
|
public TsFileContent(String prefix, String postfix) {
|
||||||
this.prefix = prefix;
|
this.prefix = prefix;
|
||||||
this.postfix = postfix;
|
this.postfix = postfix;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getPrefix() {
|
public String getPrefix() {
|
||||||
return prefix;
|
return prefix;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getPostfix() {
|
public String getPostfix() {
|
||||||
return postfix;
|
return postfix;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,39 +1,39 @@
|
||||||
package com.rusefi;
|
package com.rusefi;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 1/22/15
|
* 1/22/15
|
||||||
*/
|
*/
|
||||||
public class TypesHelper {
|
public class TypesHelper {
|
||||||
public static int getElementSize(String type) {
|
public static int getElementSize(String type) {
|
||||||
if (type == null)
|
if (type == null)
|
||||||
throw new NullPointerException("type");
|
throw new NullPointerException("type");
|
||||||
if (ConfigDefinition.structures.containsKey(type))
|
if (ConfigDefinition.structures.containsKey(type))
|
||||||
return ConfigDefinition.structures.get(type).totalSize;
|
return ConfigDefinition.structures.get(type).totalSize;
|
||||||
if (ConfigDefinition.tsCustomSize.containsKey(type))
|
if (ConfigDefinition.tsCustomSize.containsKey(type))
|
||||||
return ConfigDefinition.tsCustomSize.get(type);
|
return ConfigDefinition.tsCustomSize.get(type);
|
||||||
if (type.equals(ConfigStructure.UINT8_T))
|
if (type.equals(ConfigStructure.UINT8_T))
|
||||||
return 1;
|
return 1;
|
||||||
if (type.equals("int16_t") || type.equals("uint16_t")) {
|
if (type.equals("int16_t") || type.equals("uint16_t")) {
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
return 4;
|
return 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
static String convertToTs(String type) {
|
static String convertToTs(String type) {
|
||||||
if (isFloat(type))
|
if (isFloat(type))
|
||||||
return "F32";
|
return "F32";
|
||||||
if ("uint32_t".equals(type))
|
if ("uint32_t".equals(type))
|
||||||
return "U32";
|
return "U32";
|
||||||
if ("int32_t".equals(type) || "int".equals(type))
|
if ("int32_t".equals(type) || "int".equals(type))
|
||||||
return "S32";
|
return "S32";
|
||||||
if ("int16_t".equals(type))
|
if ("int16_t".equals(type))
|
||||||
return "S16";
|
return "S16";
|
||||||
if ("uint16_t".equals(type))
|
if ("uint16_t".equals(type))
|
||||||
return "U16";
|
return "U16";
|
||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isFloat(String type) {
|
public static boolean isFloat(String type) {
|
||||||
return "float".equals(type) || type.equalsIgnoreCase("angle_t");
|
return "float".equals(type) || type.equalsIgnoreCase("angle_t");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,85 +1,85 @@
|
||||||
package com.rusefi;
|
package com.rusefi;
|
||||||
|
|
||||||
import java.io.BufferedWriter;
|
import java.io.BufferedWriter;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileWriter;
|
import java.io.FileWriter;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.TreeMap;
|
import java.util.TreeMap;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 3/30/2015
|
* 3/30/2015
|
||||||
*/
|
*/
|
||||||
public class VariableRegistry extends TreeMap<String, String> {
|
public class VariableRegistry extends TreeMap<String, String> {
|
||||||
public static final VariableRegistry INSTANCE = new VariableRegistry();
|
public static final VariableRegistry INSTANCE = new VariableRegistry();
|
||||||
|
|
||||||
private final Pattern VAR = Pattern.compile("(@@(.*?)@@)");
|
private final Pattern VAR = Pattern.compile("(@@(.*?)@@)");
|
||||||
|
|
||||||
public Map<String, Integer> intValues = new HashMap<>();
|
public Map<String, Integer> intValues = new HashMap<>();
|
||||||
|
|
||||||
private final StringBuilder cNumbericDefinitions = new StringBuilder();
|
private final StringBuilder cNumbericDefinitions = new StringBuilder();
|
||||||
private final StringBuilder javaNumbericDefinitions = new StringBuilder();
|
private final StringBuilder javaNumbericDefinitions = new StringBuilder();
|
||||||
|
|
||||||
private VariableRegistry() {
|
private VariableRegistry() {
|
||||||
super(String.CASE_INSENSITIVE_ORDER);
|
super(String.CASE_INSENSITIVE_ORDER);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String processLine(String line) {
|
public String processLine(String line) {
|
||||||
Matcher m;
|
Matcher m;
|
||||||
while ((m = VAR.matcher(line)).find()) {
|
while ((m = VAR.matcher(line)).find()) {
|
||||||
String key = m.group(2);
|
String key = m.group(2);
|
||||||
|
|
||||||
|
|
||||||
// key =
|
// key =
|
||||||
|
|
||||||
if (!containsKey(key))
|
if (!containsKey(key))
|
||||||
throw new IllegalStateException("No such variable: " + key);
|
throw new IllegalStateException("No such variable: " + key);
|
||||||
String s = get(key);
|
String s = get(key);
|
||||||
line = m.replaceFirst(s);
|
line = m.replaceFirst(s);
|
||||||
}
|
}
|
||||||
return line;
|
return line;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void register(String var, String value) {
|
public void register(String var, String value) {
|
||||||
System.out.println("Registering " + var + " as " + value);
|
System.out.println("Registering " + var + " as " + value);
|
||||||
put(var, value);
|
put(var, value);
|
||||||
|
|
||||||
tryToRegisterAsInteger(var, value);
|
tryToRegisterAsInteger(var, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("StringConcatenationInsideStringBufferAppend")
|
@SuppressWarnings("StringConcatenationInsideStringBufferAppend")
|
||||||
private void tryToRegisterAsInteger(String var, String value) {
|
private void tryToRegisterAsInteger(String var, String value) {
|
||||||
try {
|
try {
|
||||||
int intValue = Integer.parseInt(value);
|
int intValue = Integer.parseInt(value);
|
||||||
System.out.println("key [" + var + "] value: " + intValue);
|
System.out.println("key [" + var + "] value: " + intValue);
|
||||||
if (intValues.containsKey(var))
|
if (intValues.containsKey(var))
|
||||||
throw new IllegalStateException("Not allowed to redefine: " + var);
|
throw new IllegalStateException("Not allowed to redefine: " + var);
|
||||||
intValues.put(var, intValue);
|
intValues.put(var, intValue);
|
||||||
cNumbericDefinitions.append("#define " + var + " " + intValue + "\r\n");
|
cNumbericDefinitions.append("#define " + var + " " + intValue + "\r\n");
|
||||||
javaNumbericDefinitions.append("\tpublic static final int " + var + " = " + intValue + ";\r\n");
|
javaNumbericDefinitions.append("\tpublic static final int " + var + " = " + intValue + ";\r\n");
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
System.out.println("Not an integer: " + value);
|
System.out.println("Not an integer: " + value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void register(String var, int i) {
|
public void register(String var, int i) {
|
||||||
register(var, Integer.toString(i));
|
register(var, Integer.toString(i));
|
||||||
register(var + "_hex", Integer.toString(i, 16));
|
register(var + "_hex", Integer.toString(i, 16));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void writeNumericsToFile(String headerDestinationFolder) throws IOException {
|
public void writeNumericsToFile(String headerDestinationFolder) throws IOException {
|
||||||
String fileName = headerDestinationFolder + File.separator + "rusefi_generated.h";
|
String fileName = headerDestinationFolder + File.separator + "rusefi_generated.h";
|
||||||
System.out.println("Writing to " + fileName);
|
System.out.println("Writing to " + fileName);
|
||||||
BufferedWriter cHeader = new BufferedWriter(new FileWriter(fileName));
|
BufferedWriter cHeader = new BufferedWriter(new FileWriter(fileName));
|
||||||
|
|
||||||
cHeader.write(cNumbericDefinitions.toString());
|
cHeader.write(cNumbericDefinitions.toString());
|
||||||
cHeader.close();
|
cHeader.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getJavaConstants() {
|
public String getJavaConstants() {
|
||||||
return javaNumbericDefinitions.toString();
|
return javaNumbericDefinitions.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,70 +1,70 @@
|
||||||
package com.rusefi.test;
|
package com.rusefi.test;
|
||||||
|
|
||||||
import com.rusefi.ConfigDefinition;
|
import com.rusefi.ConfigDefinition;
|
||||||
import com.rusefi.ConfigField;
|
import com.rusefi.ConfigField;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import static org.junit.Assert.assertNull;
|
import static org.junit.Assert.assertNull;
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 1/15/15
|
* 1/15/15
|
||||||
*/
|
*/
|
||||||
public class ConfigDefinitionTest {
|
public class ConfigDefinitionTest {
|
||||||
@Test
|
@Test
|
||||||
public void testComment() {
|
public void testComment() {
|
||||||
assertEquals("", ConfigDefinition.packComment("", "\t"));
|
assertEquals("", ConfigDefinition.packComment("", "\t"));
|
||||||
assertEquals("\t * abc\r\n", ConfigDefinition.packComment("abc", "\t"));
|
assertEquals("\t * abc\r\n", ConfigDefinition.packComment("abc", "\t"));
|
||||||
assertEquals("\t * abc\r\n" +
|
assertEquals("\t * abc\r\n" +
|
||||||
"\t * vbn\r\n", ConfigDefinition.packComment("abc\\nvbn", "\t"));
|
"\t * vbn\r\n", ConfigDefinition.packComment("abc\\nvbn", "\t"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testParseLine() {
|
public void testParseLine() {
|
||||||
assertNull(ConfigField.parse("int"));
|
assertNull(ConfigField.parse("int"));
|
||||||
{
|
{
|
||||||
ConfigField cf = ConfigField.parse("int field");
|
ConfigField cf = ConfigField.parse("int field");
|
||||||
assertEquals(cf.type, "int");
|
assertEquals(cf.type, "int");
|
||||||
assertEquals("Name", cf.name, "field");
|
assertEquals("Name", cf.name, "field");
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
ConfigField cf = ConfigField.parse("int_4 fie4_ld");
|
ConfigField cf = ConfigField.parse("int_4 fie4_ld");
|
||||||
assertEquals(cf.type, "int_4");
|
assertEquals(cf.type, "int_4");
|
||||||
assertEquals(cf.name, "fie4_ld");
|
assertEquals(cf.name, "fie4_ld");
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
ConfigField cf = ConfigField.parse("int_8 fi_eld;comm_;ts");
|
ConfigField cf = ConfigField.parse("int_8 fi_eld;comm_;ts");
|
||||||
assertEquals(cf.type, "int_8");
|
assertEquals(cf.type, "int_8");
|
||||||
assertEquals(cf.name, "fi_eld");
|
assertEquals(cf.name, "fi_eld");
|
||||||
assertEquals("Comment", cf.comment, "comm_");
|
assertEquals("Comment", cf.comment, "comm_");
|
||||||
assertEquals(cf.tsInfo, "ts");
|
assertEquals(cf.tsInfo, "ts");
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
ConfigField cf = ConfigField.parse("int[3 iterate] field");
|
ConfigField cf = ConfigField.parse("int[3 iterate] field");
|
||||||
assertEquals(cf.type, "int");
|
assertEquals(cf.type, "int");
|
||||||
assertEquals(cf.arraySize, 3);
|
assertEquals(cf.arraySize, 3);
|
||||||
assertTrue("isIterate", cf.isIterate);
|
assertTrue("isIterate", cf.isIterate);
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
ConfigField cf = ConfigField.parse("int16_t crankingRpm;This,. value controls what RPM values we consider 'cranking' (any RPM below 'crankingRpm')\\nAnything above 'crankingRpm' would be 'running'");
|
ConfigField cf = ConfigField.parse("int16_t crankingRpm;This,. value controls what RPM values we consider 'cranking' (any RPM below 'crankingRpm')\\nAnything above 'crankingRpm' would be 'running'");
|
||||||
assertEquals(cf.name, "crankingRpm");
|
assertEquals(cf.name, "crankingRpm");
|
||||||
assertEquals(cf.arraySize, 1);
|
assertEquals(cf.arraySize, 1);
|
||||||
assertEquals(cf.type, "int16_t");
|
assertEquals(cf.type, "int16_t");
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
ConfigField cf = ConfigField.parse("MAP_sensor_config_s map");
|
ConfigField cf = ConfigField.parse("MAP_sensor_config_s map");
|
||||||
assertEquals(cf.name, "map");
|
assertEquals(cf.name, "map");
|
||||||
assertEquals(cf.arraySize, 1);
|
assertEquals(cf.arraySize, 1);
|
||||||
assertEquals(cf.type, "MAP_sensor_config_s");
|
assertEquals(cf.type, "MAP_sensor_config_s");
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
ConfigField cf = ConfigField.parse("MAP_sensor_config_s map;@see hasMapSensor\\n@see isMapAveragingEnabled");
|
ConfigField cf = ConfigField.parse("MAP_sensor_config_s map;@see hasMapSensor\\n@see isMapAveragingEnabled");
|
||||||
assertEquals(cf.name, "map");
|
assertEquals(cf.name, "map");
|
||||||
assertEquals(cf.arraySize, 1);
|
assertEquals(cf.arraySize, 1);
|
||||||
assertEquals(cf.type, "MAP_sensor_config_s");
|
assertEquals(cf.type, "MAP_sensor_config_s");
|
||||||
assertEquals(cf.comment, "@see hasMapSensor\\n@see isMapAveragingEnabled");
|
assertEquals(cf.comment, "@see hasMapSensor\\n@see isMapAveragingEnabled");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,23 @@
|
||||||
package com.rusefi.test;
|
package com.rusefi.test;
|
||||||
|
|
||||||
import com.rusefi.VariableRegistry;
|
import com.rusefi.VariableRegistry;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 3/30/2015
|
* 3/30/2015
|
||||||
*/
|
*/
|
||||||
public class VariableRegistryTest {
|
public class VariableRegistryTest {
|
||||||
@Test
|
@Test
|
||||||
public void testReplace() {
|
public void testReplace() {
|
||||||
VariableRegistry.INSTANCE.clear();
|
VariableRegistry.INSTANCE.clear();
|
||||||
|
|
||||||
VariableRegistry.INSTANCE.register("var", 256);
|
VariableRegistry.INSTANCE.register("var", 256);
|
||||||
|
|
||||||
assertEquals("256", VariableRegistry.INSTANCE.processLine("@@var@@"));
|
assertEquals("256", VariableRegistry.INSTANCE.processLine("@@var@@"));
|
||||||
assertEquals("ab256", VariableRegistry.INSTANCE.processLine("ab@@var@@"));
|
assertEquals("ab256", VariableRegistry.INSTANCE.processLine("ab@@var@@"));
|
||||||
assertEquals("ab256cd", VariableRegistry.INSTANCE.processLine("ab@@var@@cd"));
|
assertEquals("ab256cd", VariableRegistry.INSTANCE.processLine("ab@@var@@cd"));
|
||||||
assertEquals("aa256qwe100fff", VariableRegistry.INSTANCE.processLine("aa@@var@@qwe@@var_hex@@fff"));
|
assertEquals("aa256qwe100fff", VariableRegistry.INSTANCE.processLine("aa@@var@@qwe@@var_hex@@fff"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,23 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="CompilerConfiguration">
|
<component name="CompilerConfiguration">
|
||||||
<option name="DEFAULT_COMPILER" value="Javac" />
|
<option name="DEFAULT_COMPILER" value="Javac" />
|
||||||
<resourceExtensions />
|
<resourceExtensions />
|
||||||
<wildcardResourcePatterns>
|
<wildcardResourcePatterns>
|
||||||
<entry name="!?*.java" />
|
<entry name="!?*.java" />
|
||||||
<entry name="!?*.form" />
|
<entry name="!?*.form" />
|
||||||
<entry name="!?*.class" />
|
<entry name="!?*.class" />
|
||||||
<entry name="!?*.groovy" />
|
<entry name="!?*.groovy" />
|
||||||
<entry name="!?*.scala" />
|
<entry name="!?*.scala" />
|
||||||
<entry name="!?*.flex" />
|
<entry name="!?*.flex" />
|
||||||
<entry name="!?*.kt" />
|
<entry name="!?*.kt" />
|
||||||
<entry name="!?*.clj" />
|
<entry name="!?*.clj" />
|
||||||
</wildcardResourcePatterns>
|
</wildcardResourcePatterns>
|
||||||
<annotationProcessing>
|
<annotationProcessing>
|
||||||
<profile default="true" name="Default" enabled="false">
|
<profile default="true" name="Default" enabled="false">
|
||||||
<processorPath useClasspath="true" />
|
<processorPath useClasspath="true" />
|
||||||
</profile>
|
</profile>
|
||||||
</annotationProcessing>
|
</annotationProcessing>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="EntryPointsManager">
|
<component name="EntryPointsManager">
|
||||||
<entry_points version="2.0" />
|
<entry_points version="2.0" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/out" />
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
</component>
|
</component>
|
||||||
<component name="SvnBranchConfigurationManager">
|
<component name="SvnBranchConfigurationManager">
|
||||||
<option name="mySupportsUserInfoFilter" value="true" />
|
<option name="mySupportsUserInfoFilter" value="true" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ProjectModuleManager">
|
<component name="ProjectModuleManager">
|
||||||
<modules>
|
<modules>
|
||||||
<module fileurl="file://$PROJECT_DIR$/enum_to_string.iml" filepath="$PROJECT_DIR$/enum_to_string.iml" />
|
<module fileurl="file://$PROJECT_DIR$/enum_to_string.iml" filepath="$PROJECT_DIR$/enum_to_string.iml" />
|
||||||
</modules>
|
</modules>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="VcsDirectoryMappings">
|
<component name="VcsDirectoryMappings">
|
||||||
<mapping directory="" vcs="svn" />
|
<mapping directory="" vcs="svn" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,441 +1,441 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" readonly="true" id="ad719350-c1ab-4bf9-bdd6-c566b8ae1052" name="Default" comment="" />
|
<list default="true" readonly="true" id="ad719350-c1ab-4bf9-bdd6-c566b8ae1052" name="Default" comment="" />
|
||||||
<ignored path="enum_to_string.iws" />
|
<ignored path="enum_to_string.iws" />
|
||||||
<ignored path=".idea/workspace.xml" />
|
<ignored path=".idea/workspace.xml" />
|
||||||
<option name="TRACKING_ENABLED" value="true" />
|
<option name="TRACKING_ENABLED" value="true" />
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
|
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
|
||||||
<component name="CreatePatchCommitExecutor">
|
<component name="CreatePatchCommitExecutor">
|
||||||
<option name="PATCH_PATH" value="" />
|
<option name="PATCH_PATH" value="" />
|
||||||
</component>
|
</component>
|
||||||
<component name="DaemonCodeAnalyzer">
|
<component name="DaemonCodeAnalyzer">
|
||||||
<disable_hints />
|
<disable_hints />
|
||||||
</component>
|
</component>
|
||||||
<component name="DebuggerManager">
|
<component name="DebuggerManager">
|
||||||
<breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
|
<breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
|
||||||
<breakpoint>
|
<breakpoint>
|
||||||
<option name="NOTIFY_CAUGHT" value="true" />
|
<option name="NOTIFY_CAUGHT" value="true" />
|
||||||
<option name="NOTIFY_UNCAUGHT" value="true" />
|
<option name="NOTIFY_UNCAUGHT" value="true" />
|
||||||
<option name="ENABLED" value="false" />
|
<option name="ENABLED" value="false" />
|
||||||
<option name="LOG_ENABLED" value="false" />
|
<option name="LOG_ENABLED" value="false" />
|
||||||
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
||||||
<option name="REMOVE_AFTER_HIT" value="false" />
|
<option name="REMOVE_AFTER_HIT" value="false" />
|
||||||
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
||||||
<option name="SUSPEND" value="true" />
|
<option name="SUSPEND" value="true" />
|
||||||
<option name="COUNT_FILTER_ENABLED" value="false" />
|
<option name="COUNT_FILTER_ENABLED" value="false" />
|
||||||
<option name="COUNT_FILTER" value="0" />
|
<option name="COUNT_FILTER" value="0" />
|
||||||
<option name="CONDITION_ENABLED" value="true" />
|
<option name="CONDITION_ENABLED" value="true" />
|
||||||
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
||||||
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
||||||
<option name="CONDITION" value="" />
|
<option name="CONDITION" value="" />
|
||||||
<option name="LOG_MESSAGE" value="" />
|
<option name="LOG_MESSAGE" value="" />
|
||||||
</breakpoint>
|
</breakpoint>
|
||||||
<breakpoint>
|
<breakpoint>
|
||||||
<option name="NOTIFY_CAUGHT" value="true" />
|
<option name="NOTIFY_CAUGHT" value="true" />
|
||||||
<option name="NOTIFY_UNCAUGHT" value="true" />
|
<option name="NOTIFY_UNCAUGHT" value="true" />
|
||||||
<option name="ENABLED" value="false" />
|
<option name="ENABLED" value="false" />
|
||||||
<option name="LOG_ENABLED" value="false" />
|
<option name="LOG_ENABLED" value="false" />
|
||||||
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
||||||
<option name="REMOVE_AFTER_HIT" value="false" />
|
<option name="REMOVE_AFTER_HIT" value="false" />
|
||||||
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
||||||
<option name="SUSPEND" value="true" />
|
<option name="SUSPEND" value="true" />
|
||||||
<option name="COUNT_FILTER_ENABLED" value="false" />
|
<option name="COUNT_FILTER_ENABLED" value="false" />
|
||||||
<option name="COUNT_FILTER" value="0" />
|
<option name="COUNT_FILTER" value="0" />
|
||||||
<option name="CONDITION_ENABLED" value="true" />
|
<option name="CONDITION_ENABLED" value="true" />
|
||||||
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
||||||
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
||||||
<option name="CONDITION" value="" />
|
<option name="CONDITION" value="" />
|
||||||
<option name="LOG_MESSAGE" value="" />
|
<option name="LOG_MESSAGE" value="" />
|
||||||
</breakpoint>
|
</breakpoint>
|
||||||
</breakpoint_any>
|
</breakpoint_any>
|
||||||
<ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
|
<ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
|
||||||
<breakpoint_rules />
|
<breakpoint_rules />
|
||||||
<ui_properties />
|
<ui_properties />
|
||||||
</component>
|
</component>
|
||||||
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
|
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
|
||||||
<component name="FavoritesManager">
|
<component name="FavoritesManager">
|
||||||
<favorites_list name="enum_to_string" />
|
<favorites_list name="enum_to_string" />
|
||||||
</component>
|
</component>
|
||||||
<component name="FileEditorManager">
|
<component name="FileEditorManager">
|
||||||
<leaf>
|
<leaf>
|
||||||
<file leaf-file-name="EnumToString.java" pinned="false" current="true" current-in-tab="true">
|
<file leaf-file-name="EnumToString.java" pinned="false" current="true" current-in-tab="true">
|
||||||
<entry file="file://$PROJECT_DIR$/src/com/rusefi/EnumToString.java">
|
<entry file="file://$PROJECT_DIR$/src/com/rusefi/EnumToString.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="14" column="5" selection-start="310" selection-end="310" vertical-scroll-proportion="0.2521739" vertical-offset="180" max-vertical-offset="782">
|
<state line="14" column="5" selection-start="310" selection-end="310" vertical-scroll-proportion="0.2521739" vertical-offset="180" max-vertical-offset="782">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="State.java" pinned="false" current="false" current-in-tab="false">
|
<file leaf-file-name="State.java" pinned="false" current="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/src/com/rusefi/State.java">
|
<entry file="file://$PROJECT_DIR$/src/com/rusefi/State.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="6" column="12" selection-start="78" selection-end="78" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
|
<state line="6" column="12" selection-start="78" selection-end="78" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
</leaf>
|
</leaf>
|
||||||
</component>
|
</component>
|
||||||
<component name="FindManager">
|
<component name="FindManager">
|
||||||
<FindUsagesManager>
|
<FindUsagesManager>
|
||||||
<setting name="OPEN_NEW_TAB" value="false" />
|
<setting name="OPEN_NEW_TAB" value="false" />
|
||||||
</FindUsagesManager>
|
</FindUsagesManager>
|
||||||
</component>
|
</component>
|
||||||
<component name="IdeDocumentHistory">
|
<component name="IdeDocumentHistory">
|
||||||
<option name="changedFiles">
|
<option name="changedFiles">
|
||||||
<list>
|
<list>
|
||||||
<option value="$PROJECT_DIR$/src/com/rusefi/State.java" />
|
<option value="$PROJECT_DIR$/src/com/rusefi/State.java" />
|
||||||
<option value="$PROJECT_DIR$/src/com/rusefi/EnumToString.java" />
|
<option value="$PROJECT_DIR$/src/com/rusefi/EnumToString.java" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectFrameBounds">
|
<component name="ProjectFrameBounds">
|
||||||
<option name="x" value="1" />
|
<option name="x" value="1" />
|
||||||
<option name="y" value="1" />
|
<option name="y" value="1" />
|
||||||
<option name="width" value="958" />
|
<option name="width" value="958" />
|
||||||
<option name="height" value="561" />
|
<option name="height" value="561" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
||||||
<OptionsSetting value="true" id="Add" />
|
<OptionsSetting value="true" id="Add" />
|
||||||
<OptionsSetting value="true" id="Remove" />
|
<OptionsSetting value="true" id="Remove" />
|
||||||
<OptionsSetting value="true" id="Checkout" />
|
<OptionsSetting value="true" id="Checkout" />
|
||||||
<OptionsSetting value="true" id="Update" />
|
<OptionsSetting value="true" id="Update" />
|
||||||
<OptionsSetting value="true" id="Status" />
|
<OptionsSetting value="true" id="Status" />
|
||||||
<OptionsSetting value="true" id="Edit" />
|
<OptionsSetting value="true" id="Edit" />
|
||||||
<ConfirmationsSetting value="0" id="Add" />
|
<ConfirmationsSetting value="0" id="Add" />
|
||||||
<ConfirmationsSetting value="0" id="Remove" />
|
<ConfirmationsSetting value="0" id="Remove" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectReloadState">
|
<component name="ProjectReloadState">
|
||||||
<option name="STATE" value="0" />
|
<option name="STATE" value="0" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectView">
|
<component name="ProjectView">
|
||||||
<navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
|
<navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
|
||||||
<flattenPackages />
|
<flattenPackages />
|
||||||
<showMembers />
|
<showMembers />
|
||||||
<showModules />
|
<showModules />
|
||||||
<showLibraryContents />
|
<showLibraryContents />
|
||||||
<hideEmptyPackages />
|
<hideEmptyPackages />
|
||||||
<abbreviatePackageNames />
|
<abbreviatePackageNames />
|
||||||
<autoscrollToSource />
|
<autoscrollToSource />
|
||||||
<autoscrollFromSource />
|
<autoscrollFromSource />
|
||||||
<sortByType />
|
<sortByType />
|
||||||
</navigator>
|
</navigator>
|
||||||
<panes>
|
<panes>
|
||||||
<pane id="Scope" />
|
<pane id="Scope" />
|
||||||
<pane id="ProjectPane">
|
<pane id="ProjectPane">
|
||||||
<subPane>
|
<subPane>
|
||||||
<PATH>
|
<PATH>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="enum_to_string" />
|
<option name="myItemId" value="enum_to_string" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
<PATH>
|
<PATH>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="enum_to_string" />
|
<option name="myItemId" value="enum_to_string" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="enum_to_string" />
|
<option name="myItemId" value="enum_to_string" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
<PATH>
|
<PATH>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="enum_to_string" />
|
<option name="myItemId" value="enum_to_string" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="enum_to_string" />
|
<option name="myItemId" value="enum_to_string" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="src" />
|
<option name="myItemId" value="src" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="rusefi" />
|
<option name="myItemId" value="rusefi" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
</subPane>
|
</subPane>
|
||||||
</pane>
|
</pane>
|
||||||
<pane id="PackagesPane" />
|
<pane id="PackagesPane" />
|
||||||
</panes>
|
</panes>
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
<property name="GoToClass.includeLibraries" value="false" />
|
<property name="GoToClass.includeLibraries" value="false" />
|
||||||
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
|
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
|
||||||
<property name="GoToFile.includeJavaFiles" value="false" />
|
<property name="GoToFile.includeJavaFiles" value="false" />
|
||||||
<property name="MemberChooser.sorted" value="false" />
|
<property name="MemberChooser.sorted" value="false" />
|
||||||
<property name="MemberChooser.showClasses" value="true" />
|
<property name="MemberChooser.showClasses" value="true" />
|
||||||
<property name="MemberChooser.copyJavadoc" value="false" />
|
<property name="MemberChooser.copyJavadoc" value="false" />
|
||||||
<property name="LayoutCode.rearrangeEntriesJava" value="false" />
|
<property name="LayoutCode.rearrangeEntriesJava" value="false" />
|
||||||
<property name="recentsLimit" value="5" />
|
<property name="recentsLimit" value="5" />
|
||||||
<property name="dynamic.classpath" value="false" />
|
<property name="dynamic.classpath" value="false" />
|
||||||
</component>
|
</component>
|
||||||
<component name="RunManager" selected="Application.EnumToString">
|
<component name="RunManager" selected="Application.EnumToString">
|
||||||
<configuration default="false" name="EnumToString" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
<configuration default="false" name="EnumToString" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||||
<option name="MAIN_CLASS_NAME" value="com.rusefi.EnumToString" />
|
<option name="MAIN_CLASS_NAME" value="com.rusefi.EnumToString" />
|
||||||
<option name="VM_PARAMETERS" />
|
<option name="VM_PARAMETERS" />
|
||||||
<option name="PROGRAM_PARAMETERS" />
|
<option name="PROGRAM_PARAMETERS" />
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<module name="enum_to_string" />
|
<module name="enum_to_string" />
|
||||||
<envs />
|
<envs />
|
||||||
<RunnerSettings RunnerId="Run" />
|
<RunnerSettings RunnerId="Run" />
|
||||||
<ConfigurationWrapper RunnerId="Run" />
|
<ConfigurationWrapper RunnerId="Run" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin" singleton="true">
|
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin" singleton="true">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
|
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
|
||||||
<option name="PROGRAM_PARAMETERS" />
|
<option name="PROGRAM_PARAMETERS" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
|
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="TESTING_TYPE" value="0" />
|
<option name="TESTING_TYPE" value="0" />
|
||||||
<option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
|
<option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
|
||||||
<option name="METHOD_NAME" value="" />
|
<option name="METHOD_NAME" value="" />
|
||||||
<option name="CLASS_NAME" value="" />
|
<option name="CLASS_NAME" value="" />
|
||||||
<option name="PACKAGE_NAME" value="" />
|
<option name="PACKAGE_NAME" value="" />
|
||||||
<option name="TARGET_SELECTION_MODE" value="EMULATOR" />
|
<option name="TARGET_SELECTION_MODE" value="EMULATOR" />
|
||||||
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
|
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
|
||||||
<option name="PREFERRED_AVD" value="" />
|
<option name="PREFERRED_AVD" value="" />
|
||||||
<option name="USE_COMMAND_LINE" value="true" />
|
<option name="USE_COMMAND_LINE" value="true" />
|
||||||
<option name="COMMAND_LINE" value="" />
|
<option name="COMMAND_LINE" value="" />
|
||||||
<option name="WIPE_USER_DATA" value="false" />
|
<option name="WIPE_USER_DATA" value="false" />
|
||||||
<option name="DISABLE_BOOT_ANIMATION" value="false" />
|
<option name="DISABLE_BOOT_ANIMATION" value="false" />
|
||||||
<option name="NETWORK_SPEED" value="full" />
|
<option name="NETWORK_SPEED" value="full" />
|
||||||
<option name="NETWORK_LATENCY" value="none" />
|
<option name="NETWORK_LATENCY" value="none" />
|
||||||
<option name="CLEAR_LOGCAT" value="false" />
|
<option name="CLEAR_LOGCAT" value="false" />
|
||||||
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
|
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="Remote" factoryName="Remote">
|
<configuration default="true" type="Remote" factoryName="Remote">
|
||||||
<option name="USE_SOCKET_TRANSPORT" value="true" />
|
<option name="USE_SOCKET_TRANSPORT" value="true" />
|
||||||
<option name="SERVER_MODE" value="false" />
|
<option name="SERVER_MODE" value="false" />
|
||||||
<option name="SHMEM_ADDRESS" value="javadebug" />
|
<option name="SHMEM_ADDRESS" value="javadebug" />
|
||||||
<option name="HOST" value="localhost" />
|
<option name="HOST" value="localhost" />
|
||||||
<option name="PORT" value="5005" />
|
<option name="PORT" value="5005" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="Applet" factoryName="Applet">
|
<configuration default="true" type="Applet" factoryName="Applet">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="HTML_FILE_NAME" />
|
<option name="HTML_FILE_NAME" />
|
||||||
<option name="HTML_USED" value="false" />
|
<option name="HTML_USED" value="false" />
|
||||||
<option name="WIDTH" value="400" />
|
<option name="WIDTH" value="400" />
|
||||||
<option name="HEIGHT" value="300" />
|
<option name="HEIGHT" value="300" />
|
||||||
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
|
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
|
||||||
<option name="VM_PARAMETERS" />
|
<option name="VM_PARAMETERS" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="TestNG" factoryName="TestNG">
|
<configuration default="true" type="TestNG" factoryName="TestNG">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<option name="SUITE_NAME" />
|
<option name="SUITE_NAME" />
|
||||||
<option name="PACKAGE_NAME" />
|
<option name="PACKAGE_NAME" />
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="METHOD_NAME" />
|
<option name="METHOD_NAME" />
|
||||||
<option name="GROUP_NAME" />
|
<option name="GROUP_NAME" />
|
||||||
<option name="TEST_OBJECT" value="CLASS" />
|
<option name="TEST_OBJECT" value="CLASS" />
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
<option name="VM_PARAMETERS" value="-ea" />
|
||||||
<option name="PARAMETERS" />
|
<option name="PARAMETERS" />
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
<option name="OUTPUT_DIRECTORY" />
|
<option name="OUTPUT_DIRECTORY" />
|
||||||
<option name="ANNOTATION_TYPE" />
|
<option name="ANNOTATION_TYPE" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
<option name="TEST_SEARCH_SCOPE">
|
||||||
<value defaultName="moduleWithDependencies" />
|
<value defaultName="moduleWithDependencies" />
|
||||||
</option>
|
</option>
|
||||||
<option name="USE_DEFAULT_REPORTERS" value="false" />
|
<option name="USE_DEFAULT_REPORTERS" value="false" />
|
||||||
<option name="PROPERTIES_FILE" />
|
<option name="PROPERTIES_FILE" />
|
||||||
<envs />
|
<envs />
|
||||||
<properties />
|
<properties />
|
||||||
<listeners />
|
<listeners />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="Application" factoryName="Application">
|
<configuration default="true" type="Application" factoryName="Application">
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="VM_PARAMETERS" />
|
<option name="VM_PARAMETERS" />
|
||||||
<option name="PROGRAM_PARAMETERS" />
|
<option name="PROGRAM_PARAMETERS" />
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<envs />
|
<envs />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="JUnit" factoryName="JUnit">
|
<configuration default="true" type="JUnit" factoryName="JUnit">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<option name="PACKAGE_NAME" />
|
<option name="PACKAGE_NAME" />
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="METHOD_NAME" />
|
<option name="METHOD_NAME" />
|
||||||
<option name="TEST_OBJECT" value="class" />
|
<option name="TEST_OBJECT" value="class" />
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
<option name="VM_PARAMETERS" value="-ea" />
|
||||||
<option name="PARAMETERS" />
|
<option name="PARAMETERS" />
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
<option name="TEST_SEARCH_SCOPE">
|
||||||
<value defaultName="moduleWithDependencies" />
|
<value defaultName="moduleWithDependencies" />
|
||||||
</option>
|
</option>
|
||||||
<envs />
|
<envs />
|
||||||
<patterns />
|
<patterns />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
|
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="ACTIVITY_CLASS" value="" />
|
<option name="ACTIVITY_CLASS" value="" />
|
||||||
<option name="MODE" value="default_activity" />
|
<option name="MODE" value="default_activity" />
|
||||||
<option name="DEPLOY" value="true" />
|
<option name="DEPLOY" value="true" />
|
||||||
<option name="ARTIFACT_NAME" value="" />
|
<option name="ARTIFACT_NAME" value="" />
|
||||||
<option name="TARGET_SELECTION_MODE" value="EMULATOR" />
|
<option name="TARGET_SELECTION_MODE" value="EMULATOR" />
|
||||||
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
|
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
|
||||||
<option name="PREFERRED_AVD" value="" />
|
<option name="PREFERRED_AVD" value="" />
|
||||||
<option name="USE_COMMAND_LINE" value="true" />
|
<option name="USE_COMMAND_LINE" value="true" />
|
||||||
<option name="COMMAND_LINE" value="" />
|
<option name="COMMAND_LINE" value="" />
|
||||||
<option name="WIPE_USER_DATA" value="false" />
|
<option name="WIPE_USER_DATA" value="false" />
|
||||||
<option name="DISABLE_BOOT_ANIMATION" value="false" />
|
<option name="DISABLE_BOOT_ANIMATION" value="false" />
|
||||||
<option name="NETWORK_SPEED" value="full" />
|
<option name="NETWORK_SPEED" value="full" />
|
||||||
<option name="NETWORK_LATENCY" value="none" />
|
<option name="NETWORK_LATENCY" value="none" />
|
||||||
<option name="CLEAR_LOGCAT" value="false" />
|
<option name="CLEAR_LOGCAT" value="false" />
|
||||||
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
|
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<list size="1">
|
<list size="1">
|
||||||
<item index="0" class="java.lang.String" itemvalue="Application.EnumToString" />
|
<item index="0" class="java.lang.String" itemvalue="Application.EnumToString" />
|
||||||
</list>
|
</list>
|
||||||
<recent_temporary>
|
<recent_temporary>
|
||||||
<list size="1">
|
<list size="1">
|
||||||
<item index="0" class="java.lang.String" itemvalue="Application.EnumToString" />
|
<item index="0" class="java.lang.String" itemvalue="Application.EnumToString" />
|
||||||
</list>
|
</list>
|
||||||
</recent_temporary>
|
</recent_temporary>
|
||||||
<configuration name="<template>" type="WebApp" default="true" selected="false">
|
<configuration name="<template>" type="WebApp" default="true" selected="false">
|
||||||
<Host>localhost</Host>
|
<Host>localhost</Host>
|
||||||
<Port>5050</Port>
|
<Port>5050</Port>
|
||||||
</configuration>
|
</configuration>
|
||||||
</component>
|
</component>
|
||||||
<component name="ShelveChangesManager" show_recycled="false" />
|
<component name="ShelveChangesManager" show_recycled="false" />
|
||||||
<component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="true" SSL_PROTOCOLS="all">
|
<component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="true" SSL_PROTOCOLS="all">
|
||||||
<option name="USER" value="" />
|
<option name="USER" value="" />
|
||||||
<option name="PASSWORD" value="" />
|
<option name="PASSWORD" value="" />
|
||||||
<option name="mySSHConnectionTimeout" value="30000" />
|
<option name="mySSHConnectionTimeout" value="30000" />
|
||||||
<option name="mySSHReadTimeout" value="30000" />
|
<option name="mySSHReadTimeout" value="30000" />
|
||||||
<option name="LAST_MERGED_REVISION" />
|
<option name="LAST_MERGED_REVISION" />
|
||||||
<option name="MERGE_DRY_RUN" value="false" />
|
<option name="MERGE_DRY_RUN" value="false" />
|
||||||
<option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
|
<option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
|
||||||
<option name="UPDATE_LOCK_ON_DEMAND" value="false" />
|
<option name="UPDATE_LOCK_ON_DEMAND" value="false" />
|
||||||
<option name="IGNORE_SPACES_IN_MERGE" value="false" />
|
<option name="IGNORE_SPACES_IN_MERGE" value="false" />
|
||||||
<option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
|
<option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
|
||||||
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
|
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
|
||||||
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
|
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
|
||||||
<option name="FORCE_UPDATE" value="false" />
|
<option name="FORCE_UPDATE" value="false" />
|
||||||
<option name="IGNORE_EXTERNALS" value="false" />
|
<option name="IGNORE_EXTERNALS" value="false" />
|
||||||
<configuration useDefault="false">C:\Users\Andrey\AppData\Roaming\Subversion</configuration>
|
<configuration useDefault="false">C:\Users\Andrey\AppData\Roaming\Subversion</configuration>
|
||||||
<myIsUseDefaultProxy>false</myIsUseDefaultProxy>
|
<myIsUseDefaultProxy>false</myIsUseDefaultProxy>
|
||||||
<supportedVersion>125</supportedVersion>
|
<supportedVersion>125</supportedVersion>
|
||||||
</component>
|
</component>
|
||||||
<component name="TaskManager">
|
<component name="TaskManager">
|
||||||
<task active="true" id="Default" summary="Default task">
|
<task active="true" id="Default" summary="Default task">
|
||||||
<changelist id="ad719350-c1ab-4bf9-bdd6-c566b8ae1052" name="Default" comment="" />
|
<changelist id="ad719350-c1ab-4bf9-bdd6-c566b8ae1052" name="Default" comment="" />
|
||||||
<created>1412594532442</created>
|
<created>1412594532442</created>
|
||||||
<updated>1412594532442</updated>
|
<updated>1412594532442</updated>
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="ToolWindowManager">
|
<component name="ToolWindowManager">
|
||||||
<frame x="1" y="1" width="958" height="561" extended-state="6" />
|
<frame x="1" y="1" width="958" height="561" extended-state="6" />
|
||||||
<editor active="true" />
|
<editor active="true" />
|
||||||
<layout>
|
<layout>
|
||||||
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24953617" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24953617" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5458015" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5458015" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293556" sideWeight="0.49778435" order="9" side_tool="true" content_ui="tabs" />
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293556" sideWeight="0.49778435" order="9" side_tool="true" content_ui="tabs" />
|
||||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24446085" sideWeight="0.46897376" order="3" side_tool="true" content_ui="tabs" />
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24446085" sideWeight="0.46897376" order="3" side_tool="true" content_ui="tabs" />
|
||||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32824427" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32824427" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32824427" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
|
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32824427" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24666667" sideWeight="0.4140625" order="1" side_tool="true" content_ui="tabs" />
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24666667" sideWeight="0.4140625" order="1" side_tool="true" content_ui="tabs" />
|
||||||
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
|
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24666667" sideWeight="0.58203125" order="0" side_tool="false" content_ui="combo" />
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24666667" sideWeight="0.58203125" order="0" side_tool="false" content_ui="combo" />
|
||||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36945814" sideWeight="0.4970458" order="2" side_tool="false" content_ui="tabs" />
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36945814" sideWeight="0.4970458" order="2" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
<window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36641222" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36641222" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="6" side_tool="false" content_ui="combo" />
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="6" side_tool="false" content_ui="combo" />
|
||||||
</layout>
|
</layout>
|
||||||
</component>
|
</component>
|
||||||
<component name="Vcs.Log.UiProperties">
|
<component name="Vcs.Log.UiProperties">
|
||||||
<option name="RECENTLY_FILTERED_USER_GROUPS">
|
<option name="RECENTLY_FILTERED_USER_GROUPS">
|
||||||
<collection />
|
<collection />
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsContentAnnotationSettings">
|
<component name="VcsContentAnnotationSettings">
|
||||||
<option name="myLimit" value="2678400000" />
|
<option name="myLimit" value="2678400000" />
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<option name="myTodoPanelSettings">
|
<option name="myTodoPanelSettings">
|
||||||
<TodoPanelSettings />
|
<TodoPanelSettings />
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="XDebuggerManager">
|
<component name="XDebuggerManager">
|
||||||
<breakpoint-manager />
|
<breakpoint-manager />
|
||||||
</component>
|
</component>
|
||||||
<component name="antWorkspaceConfiguration">
|
<component name="antWorkspaceConfiguration">
|
||||||
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
||||||
<option name="FILTER_TARGETS" value="false" />
|
<option name="FILTER_TARGETS" value="false" />
|
||||||
</component>
|
</component>
|
||||||
<component name="editorHistoryManager">
|
<component name="editorHistoryManager">
|
||||||
<entry file="file://$PROJECT_DIR$/src/com/rusefi/State.java">
|
<entry file="file://$PROJECT_DIR$/src/com/rusefi/State.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="6" column="12" selection-start="78" selection-end="78" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
|
<state line="6" column="12" selection-start="78" selection-end="78" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/com/rusefi/EnumToString.java">
|
<entry file="file://$PROJECT_DIR$/src/com/rusefi/EnumToString.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="14" column="5" selection-start="310" selection-end="310" vertical-scroll-proportion="0.2521739" vertical-offset="180" max-vertical-offset="782">
|
<state line="14" column="5" selection-start="310" selection-end="310" vertical-scroll-proportion="0.2521739" vertical-offset="180" max-vertical-offset="782">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,24 @@
|
||||||
<project default="jar">
|
<project default="jar">
|
||||||
|
|
||||||
<target name="clean">
|
<target name="clean">
|
||||||
<delete dir="build"/>
|
<delete dir="build"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="compile">
|
<target name="compile">
|
||||||
<mkdir dir="build/classes"/>
|
<mkdir dir="build/classes"/>
|
||||||
<javac destdir="build/classes" classpath="lib/junit.jar:lib/annotations.jar">
|
<javac destdir="build/classes" classpath="lib/junit.jar:lib/annotations.jar">
|
||||||
<src path="src"/>
|
<src path="src"/>
|
||||||
</javac>
|
</javac>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="jar" depends="compile">
|
<target name="jar" depends="compile">
|
||||||
<mkdir dir="build/jar"/>
|
<mkdir dir="build/jar"/>
|
||||||
<jar destfile="../enum2string.jar" basedir="build/classes">
|
<jar destfile="../enum2string.jar" basedir="build/classes">
|
||||||
<manifest>
|
<manifest>
|
||||||
<attribute name="Main-Class" value="com.rusefi.EnumToString"/>
|
<attribute name="Main-Class" value="com.rusefi.EnumToString"/>
|
||||||
</manifest>
|
</manifest>
|
||||||
<zipfileset dir="build/classes" includes="**/*.class"/>
|
<zipfileset dir="build/classes" includes="**/*.class"/>
|
||||||
</jar>
|
</jar>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module type="JAVA_MODULE" version="4">
|
<module type="JAVA_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,121 +1,121 @@
|
||||||
package com.rusefi;
|
package com.rusefi;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.TreeSet;
|
import java.util.TreeSet;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* <p/>
|
* <p/>
|
||||||
* 10/6/14
|
* 10/6/14
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("StringConcatenationInsideStringBufferAppend")
|
@SuppressWarnings("StringConcatenationInsideStringBufferAppend")
|
||||||
public class EnumToString {
|
public class EnumToString {
|
||||||
private final static Set<String> currentValues = new TreeSet<String>();
|
private final static Set<String> currentValues = new TreeSet<String>();
|
||||||
|
|
||||||
private final static StringBuilder result = new StringBuilder();
|
private final static StringBuilder result = new StringBuilder();
|
||||||
private final static StringBuilder header = new StringBuilder();
|
private final static StringBuilder header = new StringBuilder();
|
||||||
|
|
||||||
public static void main(String[] args) throws IOException {
|
public static void main(String[] args) throws IOException {
|
||||||
if (args.length != 1) {
|
if (args.length != 1) {
|
||||||
System.out.println("Please specify one parameter: path to firmware folder");
|
System.out.println("Please specify one parameter: path to firmware folder");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
String path = args[0];
|
String path = args[0];
|
||||||
|
|
||||||
header.append("#ifndef _A_H_HEADER_\r\n");
|
header.append("#ifndef _A_H_HEADER_\r\n");
|
||||||
header.append("#define _A_H_HEADER_\r\n");
|
header.append("#define _A_H_HEADER_\r\n");
|
||||||
|
|
||||||
process(path + File.separator + "controllers/algo/io_pins.h");
|
process(path + File.separator + "controllers/algo/io_pins.h");
|
||||||
process(path + File.separator + "controllers/algo/rusefi_enums.h");
|
process(path + File.separator + "controllers/algo/rusefi_enums.h");
|
||||||
|
|
||||||
header.append("#endif /*_A_H_HEADER_ */\r\n");
|
header.append("#endif /*_A_H_HEADER_ */\r\n");
|
||||||
|
|
||||||
writeResult("auto_generated_enums");
|
writeResult("auto_generated_enums");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void writeResult(String outFileName) throws IOException {
|
private static void writeResult(String outFileName) throws IOException {
|
||||||
BufferedWriter bw = new BufferedWriter(new FileWriter(outFileName + ".cpp"));
|
BufferedWriter bw = new BufferedWriter(new FileWriter(outFileName + ".cpp"));
|
||||||
bw.write(result.toString());
|
bw.write(result.toString());
|
||||||
bw.close();
|
bw.close();
|
||||||
|
|
||||||
bw = new BufferedWriter(new FileWriter(outFileName + ".h"));
|
bw = new BufferedWriter(new FileWriter(outFileName + ".h"));
|
||||||
bw.write(header.toString());
|
bw.write(header.toString());
|
||||||
bw.close();
|
bw.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void process(String inFileName) throws IOException {
|
private static void process(String inFileName) throws IOException {
|
||||||
BufferedReader reader;
|
BufferedReader reader;
|
||||||
|
|
||||||
String header = "// auto-generated from" + inFileName + "\r\n" +
|
String header = "// auto-generated from" + inFileName + "\r\n" +
|
||||||
"// by enum2string.jar tool\r\n\r\n";
|
"// by enum2string.jar tool\r\n\r\n";
|
||||||
result.append(header);
|
result.append(header);
|
||||||
EnumToString.header.append(header);
|
EnumToString.header.append(header);
|
||||||
|
|
||||||
boolean isInsideEnum = false;
|
boolean isInsideEnum = false;
|
||||||
|
|
||||||
File f = new File(inFileName);
|
File f = new File(inFileName);
|
||||||
System.out.println("Reading from " + inFileName);
|
System.out.println("Reading from " + inFileName);
|
||||||
String simpleFileName = f.getName();
|
String simpleFileName = f.getName();
|
||||||
|
|
||||||
result.append("#include \"main.h\"\r\n");
|
result.append("#include \"main.h\"\r\n");
|
||||||
result.append("#include \"" + simpleFileName + "\"\r\n");
|
result.append("#include \"" + simpleFileName + "\"\r\n");
|
||||||
EnumToString.header.append("#include \"" + simpleFileName + "\"\r\n");
|
EnumToString.header.append("#include \"" + simpleFileName + "\"\r\n");
|
||||||
|
|
||||||
reader = new BufferedReader(new FileReader(inFileName));
|
reader = new BufferedReader(new FileReader(inFileName));
|
||||||
String line;
|
String line;
|
||||||
while ((line = reader.readLine()) != null) {
|
while ((line = reader.readLine()) != null) {
|
||||||
line = line.replaceAll("\\s+", "");
|
line = line.replaceAll("\\s+", "");
|
||||||
|
|
||||||
if (line.startsWith("typedefenum{")) {
|
if (line.startsWith("typedefenum{")) {
|
||||||
System.out.println("Entering enum");
|
System.out.println("Entering enum");
|
||||||
currentValues.clear();
|
currentValues.clear();
|
||||||
isInsideEnum = true;
|
isInsideEnum = true;
|
||||||
} else if (line.startsWith("}") && line.endsWith(";")) {
|
} else if (line.startsWith("}") && line.endsWith(";")) {
|
||||||
isInsideEnum = false;
|
isInsideEnum = false;
|
||||||
line = line.substring(1, line.length() - 1);
|
line = line.substring(1, line.length() - 1);
|
||||||
System.out.println("Ending enum " + line);
|
System.out.println("Ending enum " + line);
|
||||||
result.append(makeCode(line));
|
result.append(makeCode(line));
|
||||||
EnumToString.header.append(getMethodSignature(line) + ";\r\n");
|
EnumToString.header.append(getMethodSignature(line) + ";\r\n");
|
||||||
} else {
|
} else {
|
||||||
line = line.replaceAll("//.+", "");
|
line = line.replaceAll("//.+", "");
|
||||||
if (isInsideEnum) {
|
if (isInsideEnum) {
|
||||||
if (line.matches("[a-zA-Z_$][a-zA-Z\\d_$]*[\\=a-zA-Z\\d_*]*,?")) {
|
if (line.matches("[a-zA-Z_$][a-zA-Z\\d_$]*[\\=a-zA-Z\\d_*]*,?")) {
|
||||||
line = line.replace(",", "");
|
line = line.replace(",", "");
|
||||||
int index = line.indexOf('=');
|
int index = line.indexOf('=');
|
||||||
if (index != -1)
|
if (index != -1)
|
||||||
line = line.substring(0, index);
|
line = line.substring(0, index);
|
||||||
System.out.println("Line " + line);
|
System.out.println("Line " + line);
|
||||||
currentValues.add(line);
|
currentValues.add(line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String makeCode(String enumName) {
|
private static String makeCode(String enumName) {
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
sb.append(getMethodSignature(enumName) + "{\r\n");
|
sb.append(getMethodSignature(enumName) + "{\r\n");
|
||||||
|
|
||||||
sb.append("switch(value) {\r\n");
|
sb.append("switch(value) {\r\n");
|
||||||
|
|
||||||
for (String e : currentValues) {
|
for (String e : currentValues) {
|
||||||
sb.append("case " + e + ":\r\n");
|
sb.append("case " + e + ":\r\n");
|
||||||
sb.append(" return \"" + e + "\";\r\n");
|
sb.append(" return \"" + e + "\";\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
sb.append(" }\r\n");
|
sb.append(" }\r\n");
|
||||||
sb.append(" return NULL;\r\n");
|
sb.append(" return NULL;\r\n");
|
||||||
sb.append("}\r\n");
|
sb.append("}\r\n");
|
||||||
|
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String getMethodSignature(String enumName) {
|
private static String getMethodSignature(String enumName) {
|
||||||
return "const char *get" + capitalize(enumName) + "(" + enumName + " value)";
|
return "const char *get" + capitalize(enumName) + "(" + enumName + " value)";
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String capitalize(String enumName) {
|
private static String capitalize(String enumName) {
|
||||||
return Character.toUpperCase(enumName.charAt(0)) + enumName.substring(1);
|
return Character.toUpperCase(enumName.charAt(0)) + enumName.substring(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
package com.rusefi;
|
package com.rusefi;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 10/6/14
|
* 10/6/14
|
||||||
*/
|
*/
|
||||||
public enum State {
|
public enum State {
|
||||||
ENUM
|
ENUM
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,23 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="CompilerConfiguration">
|
<component name="CompilerConfiguration">
|
||||||
<option name="DEFAULT_COMPILER" value="Javac" />
|
<option name="DEFAULT_COMPILER" value="Javac" />
|
||||||
<resourceExtensions />
|
<resourceExtensions />
|
||||||
<wildcardResourcePatterns>
|
<wildcardResourcePatterns>
|
||||||
<entry name="!?*.java" />
|
<entry name="!?*.java" />
|
||||||
<entry name="!?*.form" />
|
<entry name="!?*.form" />
|
||||||
<entry name="!?*.class" />
|
<entry name="!?*.class" />
|
||||||
<entry name="!?*.groovy" />
|
<entry name="!?*.groovy" />
|
||||||
<entry name="!?*.scala" />
|
<entry name="!?*.scala" />
|
||||||
<entry name="!?*.flex" />
|
<entry name="!?*.flex" />
|
||||||
<entry name="!?*.kt" />
|
<entry name="!?*.kt" />
|
||||||
<entry name="!?*.clj" />
|
<entry name="!?*.clj" />
|
||||||
</wildcardResourcePatterns>
|
</wildcardResourcePatterns>
|
||||||
<annotationProcessing>
|
<annotationProcessing>
|
||||||
<profile default="true" name="Default" enabled="false">
|
<profile default="true" name="Default" enabled="false">
|
||||||
<processorPath useClasspath="true" />
|
<processorPath useClasspath="true" />
|
||||||
</profile>
|
</profile>
|
||||||
</annotationProcessing>
|
</annotationProcessing>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<component name="CopyrightManager">
|
<component name="CopyrightManager">
|
||||||
<settings default="">
|
<settings default="">
|
||||||
<module2copyright />
|
<module2copyright />
|
||||||
</settings>
|
</settings>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
|
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="EntryPointsManager">
|
<component name="EntryPointsManager">
|
||||||
<entry_points version="2.0" />
|
<entry_points version="2.0" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/out" />
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
</component>
|
</component>
|
||||||
<component name="SvnBranchConfigurationManager">
|
<component name="SvnBranchConfigurationManager">
|
||||||
<option name="mySupportsUserInfoFilter" value="true" />
|
<option name="mySupportsUserInfoFilter" value="true" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ProjectModuleManager">
|
<component name="ProjectModuleManager">
|
||||||
<modules>
|
<modules>
|
||||||
<module fileurl="file://$PROJECT_DIR$/gcc_map_reader.iml" filepath="$PROJECT_DIR$/gcc_map_reader.iml" />
|
<module fileurl="file://$PROJECT_DIR$/gcc_map_reader.iml" filepath="$PROJECT_DIR$/gcc_map_reader.iml" />
|
||||||
</modules>
|
</modules>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<component name="DependencyValidationManager">
|
<component name="DependencyValidationManager">
|
||||||
<state>
|
<state>
|
||||||
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
|
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
|
||||||
</state>
|
</state>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,125 +1,125 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="Palette2">
|
<component name="Palette2">
|
||||||
<group name="Swing">
|
<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">
|
<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" />
|
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
|
||||||
</item>
|
</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">
|
<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" />
|
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
|
<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" />
|
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="Button" />
|
<property name="text" value="Button" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="RadioButton" />
|
<property name="text" value="RadioButton" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="CheckBox" />
|
<property name="text" value="CheckBox" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="Label" />
|
<property name="text" value="Label" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
<preferred-size width="150" height="-1" />
|
<preferred-size width="150" height="-1" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
<preferred-size width="150" height="-1" />
|
<preferred-size width="150" height="-1" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
<preferred-size width="150" height="-1" />
|
<preferred-size width="150" height="-1" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||||
<preferred-size width="200" height="200" />
|
<preferred-size width="200" height="200" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||||
<preferred-size width="200" height="200" />
|
<preferred-size width="200" height="200" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
|
||||||
<preferred-size width="-1" height="20" />
|
<preferred-size width="-1" height="20" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
|
||||||
</item>
|
</item>
|
||||||
</group>
|
</group>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="VcsDirectoryMappings">
|
<component name="VcsDirectoryMappings">
|
||||||
<mapping directory="" vcs="svn" />
|
<mapping directory="" vcs="svn" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,460 +1,460 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" readonly="true" id="d25d16f1-bb3a-4204-ac14-48526d2df69c" name="Default" comment="" />
|
<list default="true" readonly="true" id="d25d16f1-bb3a-4204-ac14-48526d2df69c" name="Default" comment="" />
|
||||||
<ignored path="gcc_map_reader.iws" />
|
<ignored path="gcc_map_reader.iws" />
|
||||||
<ignored path=".idea/workspace.xml" />
|
<ignored path=".idea/workspace.xml" />
|
||||||
<file path="/GccMapReader.java" changelist="d25d16f1-bb3a-4204-ac14-48526d2df69c" time="1385943544305" ignored="false" />
|
<file path="/GccMapReader.java" changelist="d25d16f1-bb3a-4204-ac14-48526d2df69c" time="1385943544305" ignored="false" />
|
||||||
<file path="/fragment.java" changelist="d25d16f1-bb3a-4204-ac14-48526d2df69c" time="1381937073931" ignored="false" />
|
<file path="/fragment.java" changelist="d25d16f1-bb3a-4204-ac14-48526d2df69c" time="1381937073931" ignored="false" />
|
||||||
<option name="TRACKING_ENABLED" value="true" />
|
<option name="TRACKING_ENABLED" value="true" />
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
|
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
|
||||||
<component name="CreatePatchCommitExecutor">
|
<component name="CreatePatchCommitExecutor">
|
||||||
<option name="PATCH_PATH" value="" />
|
<option name="PATCH_PATH" value="" />
|
||||||
</component>
|
</component>
|
||||||
<component name="DaemonCodeAnalyzer">
|
<component name="DaemonCodeAnalyzer">
|
||||||
<disable_hints />
|
<disable_hints />
|
||||||
</component>
|
</component>
|
||||||
<component name="DebuggerManager">
|
<component name="DebuggerManager">
|
||||||
<breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
|
<breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
|
||||||
<breakpoint>
|
<breakpoint>
|
||||||
<option name="NOTIFY_CAUGHT" value="true" />
|
<option name="NOTIFY_CAUGHT" value="true" />
|
||||||
<option name="NOTIFY_UNCAUGHT" value="true" />
|
<option name="NOTIFY_UNCAUGHT" value="true" />
|
||||||
<option name="ENABLED" value="false" />
|
<option name="ENABLED" value="false" />
|
||||||
<option name="LOG_ENABLED" value="false" />
|
<option name="LOG_ENABLED" value="false" />
|
||||||
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
||||||
<option name="REMOVE_AFTER_HIT" value="false" />
|
<option name="REMOVE_AFTER_HIT" value="false" />
|
||||||
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
||||||
<option name="SUSPEND" value="true" />
|
<option name="SUSPEND" value="true" />
|
||||||
<option name="COUNT_FILTER_ENABLED" value="false" />
|
<option name="COUNT_FILTER_ENABLED" value="false" />
|
||||||
<option name="COUNT_FILTER" value="0" />
|
<option name="COUNT_FILTER" value="0" />
|
||||||
<option name="CONDITION_ENABLED" value="true" />
|
<option name="CONDITION_ENABLED" value="true" />
|
||||||
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
||||||
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
||||||
<option name="CONDITION" value="" />
|
<option name="CONDITION" value="" />
|
||||||
<option name="LOG_MESSAGE" value="" />
|
<option name="LOG_MESSAGE" value="" />
|
||||||
</breakpoint>
|
</breakpoint>
|
||||||
<breakpoint>
|
<breakpoint>
|
||||||
<option name="NOTIFY_CAUGHT" value="true" />
|
<option name="NOTIFY_CAUGHT" value="true" />
|
||||||
<option name="NOTIFY_UNCAUGHT" value="true" />
|
<option name="NOTIFY_UNCAUGHT" value="true" />
|
||||||
<option name="ENABLED" value="false" />
|
<option name="ENABLED" value="false" />
|
||||||
<option name="LOG_ENABLED" value="false" />
|
<option name="LOG_ENABLED" value="false" />
|
||||||
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
||||||
<option name="REMOVE_AFTER_HIT" value="false" />
|
<option name="REMOVE_AFTER_HIT" value="false" />
|
||||||
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
||||||
<option name="SUSPEND" value="true" />
|
<option name="SUSPEND" value="true" />
|
||||||
<option name="COUNT_FILTER_ENABLED" value="false" />
|
<option name="COUNT_FILTER_ENABLED" value="false" />
|
||||||
<option name="COUNT_FILTER" value="0" />
|
<option name="COUNT_FILTER" value="0" />
|
||||||
<option name="CONDITION_ENABLED" value="true" />
|
<option name="CONDITION_ENABLED" value="true" />
|
||||||
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
||||||
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
||||||
<option name="CONDITION" value="" />
|
<option name="CONDITION" value="" />
|
||||||
<option name="LOG_MESSAGE" value="" />
|
<option name="LOG_MESSAGE" value="" />
|
||||||
</breakpoint>
|
</breakpoint>
|
||||||
</breakpoint_any>
|
</breakpoint_any>
|
||||||
<ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
|
<ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
|
||||||
<breakpoint_rules />
|
<breakpoint_rules />
|
||||||
<ui_properties />
|
<ui_properties />
|
||||||
</component>
|
</component>
|
||||||
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
|
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
|
||||||
<component name="FavoritesManager">
|
<component name="FavoritesManager">
|
||||||
<favorites_list name="gcc_map_reader" />
|
<favorites_list name="gcc_map_reader" />
|
||||||
</component>
|
</component>
|
||||||
<component name="FileEditorManager">
|
<component name="FileEditorManager">
|
||||||
<leaf>
|
<leaf>
|
||||||
<file leaf-file-name="GccMapReader.java" pinned="false" current="true" current-in-tab="true">
|
<file leaf-file-name="GccMapReader.java" pinned="false" current="true" current-in-tab="true">
|
||||||
<entry file="file://$PROJECT_DIR$/src/rusefi/GccMapReader.java">
|
<entry file="file://$PROJECT_DIR$/src/rusefi/GccMapReader.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="56" column="17" selection-start="1616" selection-end="1616" vertical-scroll-proportion="1.0455374">
|
<state line="56" column="17" selection-start="1616" selection-end="1616" vertical-scroll-proportion="1.0455374">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
<element signature="e#578#586#0" expanded="true" />
|
<element signature="e#578#586#0" expanded="true" />
|
||||||
<element signature="e#1431#1439#0" expanded="true" />
|
<element signature="e#1431#1439#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
</leaf>
|
</leaf>
|
||||||
</component>
|
</component>
|
||||||
<component name="FindManager">
|
<component name="FindManager">
|
||||||
<FindUsagesManager>
|
<FindUsagesManager>
|
||||||
<setting name="OPEN_NEW_TAB" value="false" />
|
<setting name="OPEN_NEW_TAB" value="false" />
|
||||||
</FindUsagesManager>
|
</FindUsagesManager>
|
||||||
</component>
|
</component>
|
||||||
<component name="IdeDocumentHistory">
|
<component name="IdeDocumentHistory">
|
||||||
<option name="changedFiles">
|
<option name="changedFiles">
|
||||||
<list>
|
<list>
|
||||||
<option value="$PROJECT_DIR$/src/rusefi/GccMapReader.java" />
|
<option value="$PROJECT_DIR$/src/rusefi/GccMapReader.java" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectFrameBounds">
|
<component name="ProjectFrameBounds">
|
||||||
<option name="x" value="-9" />
|
<option name="x" value="-9" />
|
||||||
<option name="y" value="-9" />
|
<option name="y" value="-9" />
|
||||||
<option name="width" value="1698" />
|
<option name="width" value="1698" />
|
||||||
<option name="height" value="1020" />
|
<option name="height" value="1020" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
||||||
<OptionsSetting value="true" id="Add" />
|
<OptionsSetting value="true" id="Add" />
|
||||||
<OptionsSetting value="true" id="Remove" />
|
<OptionsSetting value="true" id="Remove" />
|
||||||
<OptionsSetting value="true" id="Checkout" />
|
<OptionsSetting value="true" id="Checkout" />
|
||||||
<OptionsSetting value="true" id="Update" />
|
<OptionsSetting value="true" id="Update" />
|
||||||
<OptionsSetting value="true" id="Status" />
|
<OptionsSetting value="true" id="Status" />
|
||||||
<OptionsSetting value="true" id="Edit" />
|
<OptionsSetting value="true" id="Edit" />
|
||||||
<ConfirmationsSetting value="0" id="Add" />
|
<ConfirmationsSetting value="0" id="Add" />
|
||||||
<ConfirmationsSetting value="0" id="Remove" />
|
<ConfirmationsSetting value="0" id="Remove" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectReloadState">
|
<component name="ProjectReloadState">
|
||||||
<option name="STATE" value="0" />
|
<option name="STATE" value="0" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectView">
|
<component name="ProjectView">
|
||||||
<navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
|
<navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
|
||||||
<flattenPackages />
|
<flattenPackages />
|
||||||
<showMembers />
|
<showMembers />
|
||||||
<showModules />
|
<showModules />
|
||||||
<showLibraryContents />
|
<showLibraryContents />
|
||||||
<hideEmptyPackages />
|
<hideEmptyPackages />
|
||||||
<abbreviatePackageNames />
|
<abbreviatePackageNames />
|
||||||
<autoscrollToSource />
|
<autoscrollToSource />
|
||||||
<autoscrollFromSource />
|
<autoscrollFromSource />
|
||||||
<sortByType />
|
<sortByType />
|
||||||
</navigator>
|
</navigator>
|
||||||
<panes>
|
<panes>
|
||||||
<pane id="ProjectPane">
|
<pane id="ProjectPane">
|
||||||
<subPane>
|
<subPane>
|
||||||
<PATH>
|
<PATH>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="gcc_map_reader" />
|
<option name="myItemId" value="gcc_map_reader" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
<PATH>
|
<PATH>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="gcc_map_reader" />
|
<option name="myItemId" value="gcc_map_reader" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="gcc_map_reader" />
|
<option name="myItemId" value="gcc_map_reader" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
<PATH>
|
<PATH>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="gcc_map_reader" />
|
<option name="myItemId" value="gcc_map_reader" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="gcc_map_reader" />
|
<option name="myItemId" value="gcc_map_reader" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="src" />
|
<option name="myItemId" value="src" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="rusefi" />
|
<option name="myItemId" value="rusefi" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
</subPane>
|
</subPane>
|
||||||
</pane>
|
</pane>
|
||||||
<pane id="Scope" />
|
<pane id="Scope" />
|
||||||
<pane id="PackagesPane" />
|
<pane id="PackagesPane" />
|
||||||
</panes>
|
</panes>
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
<property name="GoToFile.includeJavaFiles" value="false" />
|
<property name="GoToFile.includeJavaFiles" value="false" />
|
||||||
<property name="OverrideImplement.combined" value="true" />
|
<property name="OverrideImplement.combined" value="true" />
|
||||||
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
|
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
|
||||||
<property name="recentsLimit" value="5" />
|
<property name="recentsLimit" value="5" />
|
||||||
<property name="MemberChooser.sorted" value="false" />
|
<property name="MemberChooser.sorted" value="false" />
|
||||||
<property name="FullScreen" value="false" />
|
<property name="FullScreen" value="false" />
|
||||||
<property name="MemberChooser.showClasses" value="true" />
|
<property name="MemberChooser.showClasses" value="true" />
|
||||||
<property name="GoToClass.includeLibraries" value="false" />
|
<property name="GoToClass.includeLibraries" value="false" />
|
||||||
<property name="dynamic.classpath" value="false" />
|
<property name="dynamic.classpath" value="false" />
|
||||||
<property name="MemberChooser.copyJavadoc" value="false" />
|
<property name="MemberChooser.copyJavadoc" value="false" />
|
||||||
</component>
|
</component>
|
||||||
<component name="RunManager" selected="Application.GccMapReader">
|
<component name="RunManager" selected="Application.GccMapReader">
|
||||||
<configuration default="false" name="GccMapReader" type="Application" factoryName="Application" temporary="true">
|
<configuration default="false" name="GccMapReader" type="Application" factoryName="Application" temporary="true">
|
||||||
<option name="MAIN_CLASS_NAME" value="rusefi.GccMapReader" />
|
<option name="MAIN_CLASS_NAME" value="rusefi.GccMapReader" />
|
||||||
<option name="VM_PARAMETERS" />
|
<option name="VM_PARAMETERS" />
|
||||||
<option name="PROGRAM_PARAMETERS" />
|
<option name="PROGRAM_PARAMETERS" />
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<module name="gcc_map_reader" />
|
<module name="gcc_map_reader" />
|
||||||
<envs />
|
<envs />
|
||||||
<RunnerSettings RunnerId="Debug">
|
<RunnerSettings RunnerId="Debug">
|
||||||
<option name="DEBUG_PORT" value="" />
|
<option name="DEBUG_PORT" value="" />
|
||||||
<option name="TRANSPORT" value="0" />
|
<option name="TRANSPORT" value="0" />
|
||||||
<option name="LOCAL" value="true" />
|
<option name="LOCAL" value="true" />
|
||||||
</RunnerSettings>
|
</RunnerSettings>
|
||||||
<RunnerSettings RunnerId="Run" />
|
<RunnerSettings RunnerId="Run" />
|
||||||
<ConfigurationWrapper RunnerId="Debug" />
|
<ConfigurationWrapper RunnerId="Debug" />
|
||||||
<ConfigurationWrapper RunnerId="Run" />
|
<ConfigurationWrapper RunnerId="Run" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
|
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
|
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
|
||||||
<option name="PROGRAM_PARAMETERS" />
|
<option name="PROGRAM_PARAMETERS" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="Remote" factoryName="Remote">
|
<configuration default="true" type="Remote" factoryName="Remote">
|
||||||
<option name="USE_SOCKET_TRANSPORT" value="true" />
|
<option name="USE_SOCKET_TRANSPORT" value="true" />
|
||||||
<option name="SERVER_MODE" value="false" />
|
<option name="SERVER_MODE" value="false" />
|
||||||
<option name="SHMEM_ADDRESS" value="javadebug" />
|
<option name="SHMEM_ADDRESS" value="javadebug" />
|
||||||
<option name="HOST" value="localhost" />
|
<option name="HOST" value="localhost" />
|
||||||
<option name="PORT" value="5005" />
|
<option name="PORT" value="5005" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="TestNG" factoryName="TestNG">
|
<configuration default="true" type="TestNG" factoryName="TestNG">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<option name="SUITE_NAME" />
|
<option name="SUITE_NAME" />
|
||||||
<option name="PACKAGE_NAME" />
|
<option name="PACKAGE_NAME" />
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="METHOD_NAME" />
|
<option name="METHOD_NAME" />
|
||||||
<option name="GROUP_NAME" />
|
<option name="GROUP_NAME" />
|
||||||
<option name="TEST_OBJECT" value="CLASS" />
|
<option name="TEST_OBJECT" value="CLASS" />
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
<option name="VM_PARAMETERS" value="-ea" />
|
||||||
<option name="PARAMETERS" />
|
<option name="PARAMETERS" />
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
<option name="OUTPUT_DIRECTORY" />
|
<option name="OUTPUT_DIRECTORY" />
|
||||||
<option name="ANNOTATION_TYPE" />
|
<option name="ANNOTATION_TYPE" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
<option name="TEST_SEARCH_SCOPE">
|
||||||
<value defaultName="moduleWithDependencies" />
|
<value defaultName="moduleWithDependencies" />
|
||||||
</option>
|
</option>
|
||||||
<option name="USE_DEFAULT_REPORTERS" value="false" />
|
<option name="USE_DEFAULT_REPORTERS" value="false" />
|
||||||
<option name="PROPERTIES_FILE" />
|
<option name="PROPERTIES_FILE" />
|
||||||
<envs />
|
<envs />
|
||||||
<properties />
|
<properties />
|
||||||
<listeners />
|
<listeners />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="Applet" factoryName="Applet">
|
<configuration default="true" type="Applet" factoryName="Applet">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="HTML_FILE_NAME" />
|
<option name="HTML_FILE_NAME" />
|
||||||
<option name="HTML_USED" value="false" />
|
<option name="HTML_USED" value="false" />
|
||||||
<option name="WIDTH" value="400" />
|
<option name="WIDTH" value="400" />
|
||||||
<option name="HEIGHT" value="300" />
|
<option name="HEIGHT" value="300" />
|
||||||
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
|
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
|
||||||
<option name="VM_PARAMETERS" />
|
<option name="VM_PARAMETERS" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="Application" factoryName="Application">
|
<configuration default="true" type="Application" factoryName="Application">
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="VM_PARAMETERS" />
|
<option name="VM_PARAMETERS" />
|
||||||
<option name="PROGRAM_PARAMETERS" />
|
<option name="PROGRAM_PARAMETERS" />
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<envs />
|
<envs />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="JUnit" factoryName="JUnit">
|
<configuration default="true" type="JUnit" factoryName="JUnit">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<option name="PACKAGE_NAME" />
|
<option name="PACKAGE_NAME" />
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="METHOD_NAME" />
|
<option name="METHOD_NAME" />
|
||||||
<option name="TEST_OBJECT" value="class" />
|
<option name="TEST_OBJECT" value="class" />
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
<option name="VM_PARAMETERS" value="-ea" />
|
||||||
<option name="PARAMETERS" />
|
<option name="PARAMETERS" />
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
<option name="TEST_SEARCH_SCOPE">
|
||||||
<value defaultName="moduleWithDependencies" />
|
<value defaultName="moduleWithDependencies" />
|
||||||
</option>
|
</option>
|
||||||
<envs />
|
<envs />
|
||||||
<patterns />
|
<patterns />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<list size="1">
|
<list size="1">
|
||||||
<item index="0" class="java.lang.String" itemvalue="Application.GccMapReader" />
|
<item index="0" class="java.lang.String" itemvalue="Application.GccMapReader" />
|
||||||
</list>
|
</list>
|
||||||
<recent_temporary>
|
<recent_temporary>
|
||||||
<list size="1">
|
<list size="1">
|
||||||
<item index="0" class="java.lang.String" itemvalue="Application.GccMapReader" />
|
<item index="0" class="java.lang.String" itemvalue="Application.GccMapReader" />
|
||||||
</list>
|
</list>
|
||||||
</recent_temporary>
|
</recent_temporary>
|
||||||
<configuration name="<template>" type="WebApp" default="true" selected="false">
|
<configuration name="<template>" type="WebApp" default="true" selected="false">
|
||||||
<Host>localhost</Host>
|
<Host>localhost</Host>
|
||||||
<Port>5050</Port>
|
<Port>5050</Port>
|
||||||
</configuration>
|
</configuration>
|
||||||
</component>
|
</component>
|
||||||
<component name="ShelveChangesManager" show_recycled="false" />
|
<component name="ShelveChangesManager" show_recycled="false" />
|
||||||
<component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="true" SSL_PROTOCOLS="all">
|
<component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="true" SSL_PROTOCOLS="all">
|
||||||
<option name="USER" value="" />
|
<option name="USER" value="" />
|
||||||
<option name="PASSWORD" value="" />
|
<option name="PASSWORD" value="" />
|
||||||
<option name="mySSHConnectionTimeout" value="30000" />
|
<option name="mySSHConnectionTimeout" value="30000" />
|
||||||
<option name="mySSHReadTimeout" value="30000" />
|
<option name="mySSHReadTimeout" value="30000" />
|
||||||
<option name="LAST_MERGED_REVISION" />
|
<option name="LAST_MERGED_REVISION" />
|
||||||
<option name="MERGE_DRY_RUN" value="false" />
|
<option name="MERGE_DRY_RUN" value="false" />
|
||||||
<option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
|
<option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
|
||||||
<option name="UPDATE_LOCK_ON_DEMAND" value="false" />
|
<option name="UPDATE_LOCK_ON_DEMAND" value="false" />
|
||||||
<option name="IGNORE_SPACES_IN_MERGE" value="false" />
|
<option name="IGNORE_SPACES_IN_MERGE" value="false" />
|
||||||
<option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
|
<option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
|
||||||
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
|
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
|
||||||
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
|
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
|
||||||
<option name="FORCE_UPDATE" value="false" />
|
<option name="FORCE_UPDATE" value="false" />
|
||||||
<option name="IGNORE_EXTERNALS" value="false" />
|
<option name="IGNORE_EXTERNALS" value="false" />
|
||||||
<configuration useDefault="false">C:\Users\Andrey\AppData\Roaming\Subversion</configuration>
|
<configuration useDefault="false">C:\Users\Andrey\AppData\Roaming\Subversion</configuration>
|
||||||
<myIsUseDefaultProxy>false</myIsUseDefaultProxy>
|
<myIsUseDefaultProxy>false</myIsUseDefaultProxy>
|
||||||
<supportedVersion>125</supportedVersion>
|
<supportedVersion>125</supportedVersion>
|
||||||
</component>
|
</component>
|
||||||
<component name="TaskManager">
|
<component name="TaskManager">
|
||||||
<task active="true" id="Default" summary="Default task">
|
<task active="true" id="Default" summary="Default task">
|
||||||
<changelist id="d25d16f1-bb3a-4204-ac14-48526d2df69c" name="Default" comment="" />
|
<changelist id="d25d16f1-bb3a-4204-ac14-48526d2df69c" name="Default" comment="" />
|
||||||
<created>1381936593168</created>
|
<created>1381936593168</created>
|
||||||
<updated>1381936593168</updated>
|
<updated>1381936593168</updated>
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="ToolWindowManager">
|
<component name="ToolWindowManager">
|
||||||
<frame x="-9" y="-9" width="1698" height="1020" extended-state="6" />
|
<frame x="-9" y="-9" width="1698" height="1020" extended-state="6" />
|
||||||
<editor active="false" />
|
<editor active="false" />
|
||||||
<layout>
|
<layout>
|
||||||
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39836448" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39836448" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
||||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
||||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3286119" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3286119" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24602203" sideWeight="0.67172897" order="0" side_tool="false" content_ui="combo" />
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24602203" sideWeight="0.67172897" order="0" side_tool="false" content_ui="combo" />
|
||||||
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32827103" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32827103" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
||||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||||
</layout>
|
</layout>
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsContentAnnotationSettings">
|
<component name="VcsContentAnnotationSettings">
|
||||||
<option name="myLimit" value="2678400000" />
|
<option name="myLimit" value="2678400000" />
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
|
<option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
|
||||||
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
|
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
|
||||||
<option name="CHECK_NEW_TODO" value="true" />
|
<option name="CHECK_NEW_TODO" value="true" />
|
||||||
<option name="myTodoPanelSettings">
|
<option name="myTodoPanelSettings">
|
||||||
<value>
|
<value>
|
||||||
<are-packages-shown value="false" />
|
<are-packages-shown value="false" />
|
||||||
<are-modules-shown value="false" />
|
<are-modules-shown value="false" />
|
||||||
<flatten-packages value="false" />
|
<flatten-packages value="false" />
|
||||||
<is-autoscroll-to-source value="false" />
|
<is-autoscroll-to-source value="false" />
|
||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
<option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
|
<option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
|
||||||
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
|
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
|
||||||
<option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
|
<option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
|
||||||
<option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
|
<option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
|
||||||
<option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
|
<option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
|
||||||
<option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
|
<option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
|
||||||
<option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
|
<option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
|
||||||
<option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
|
<option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
|
||||||
<option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
|
<option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
|
||||||
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
|
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
|
||||||
<option name="DEFAULT_PATCH_EXTENSION" value="patch" />
|
<option name="DEFAULT_PATCH_EXTENSION" value="patch" />
|
||||||
<option name="SHORT_DIFF_HORIZONTALLY" value="true" />
|
<option name="SHORT_DIFF_HORIZONTALLY" value="true" />
|
||||||
<option name="SHORT_DIFF_EXTRA_LINES" value="2" />
|
<option name="SHORT_DIFF_EXTRA_LINES" value="2" />
|
||||||
<option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
|
<option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
|
||||||
<option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
|
<option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
|
||||||
<option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
|
<option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
|
||||||
<option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
|
<option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
|
||||||
<option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
|
<option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
|
||||||
<option name="SHOW_DIRTY_RECURSIVELY" value="false" />
|
<option name="SHOW_DIRTY_RECURSIVELY" value="false" />
|
||||||
<option name="LIMIT_HISTORY" value="true" />
|
<option name="LIMIT_HISTORY" value="true" />
|
||||||
<option name="MAXIMUM_HISTORY_ROWS" value="1000" />
|
<option name="MAXIMUM_HISTORY_ROWS" value="1000" />
|
||||||
<option name="UPDATE_FILTER_SCOPE_NAME" />
|
<option name="UPDATE_FILTER_SCOPE_NAME" />
|
||||||
<option name="USE_COMMIT_MESSAGE_MARGIN" value="false" />
|
<option name="USE_COMMIT_MESSAGE_MARGIN" value="false" />
|
||||||
<option name="COMMIT_MESSAGE_MARGIN_SIZE" value="72" />
|
<option name="COMMIT_MESSAGE_MARGIN_SIZE" value="72" />
|
||||||
<option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
|
<option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
|
||||||
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
|
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
|
||||||
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
|
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" />
|
<option name="LAST_COMMIT_MESSAGE" />
|
||||||
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
|
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
|
||||||
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
|
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
|
||||||
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
|
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
|
||||||
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
|
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
|
||||||
<option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
|
<option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
|
||||||
<option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
|
<option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
|
||||||
<option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
|
<option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
|
||||||
<option name="ACTIVE_VCS_NAME" />
|
<option name="ACTIVE_VCS_NAME" />
|
||||||
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
|
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
|
||||||
<option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
|
<option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
|
||||||
<option name="UPDATE_FILTER_BY_SCOPE" value="false" />
|
<option name="UPDATE_FILTER_BY_SCOPE" value="false" />
|
||||||
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
|
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
|
||||||
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
|
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
|
||||||
</component>
|
</component>
|
||||||
<component name="XDebuggerManager">
|
<component name="XDebuggerManager">
|
||||||
<breakpoint-manager />
|
<breakpoint-manager />
|
||||||
</component>
|
</component>
|
||||||
<component name="antWorkspaceConfiguration">
|
<component name="antWorkspaceConfiguration">
|
||||||
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
||||||
<option name="FILTER_TARGETS" value="false" />
|
<option name="FILTER_TARGETS" value="false" />
|
||||||
</component>
|
</component>
|
||||||
<component name="editorHistoryManager">
|
<component name="editorHistoryManager">
|
||||||
<entry file="file://$PROJECT_DIR$/src/rusefi/GccMapReader.java">
|
<entry file="file://$PROJECT_DIR$/src/rusefi/GccMapReader.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
|
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
<element signature="e#578#586#0" expanded="true" />
|
<element signature="e#578#586#0" expanded="true" />
|
||||||
<element signature="e#1431#1439#0" expanded="true" />
|
<element signature="e#1431#1439#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/rusefi/GccMapReader.java">
|
<entry file="file://$PROJECT_DIR$/src/rusefi/GccMapReader.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
|
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
<element signature="e#578#586#0" expanded="true" />
|
<element signature="e#578#586#0" expanded="true" />
|
||||||
<element signature="e#1431#1439#0" expanded="true" />
|
<element signature="e#1431#1439#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/rusefi/GccMapReader.java">
|
<entry file="file://$PROJECT_DIR$/src/rusefi/GccMapReader.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="56" column="17" selection-start="1616" selection-end="1616" vertical-scroll-proportion="1.0455374">
|
<state line="56" column="17" selection-start="1616" selection-end="1616" vertical-scroll-proportion="1.0455374">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
<element signature="e#578#586#0" expanded="true" />
|
<element signature="e#578#586#0" expanded="true" />
|
||||||
<element signature="e#1431#1439#0" expanded="true" />
|
<element signature="e#1431#1439#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,28 +1,28 @@
|
||||||
<project default="jar">
|
<project default="jar">
|
||||||
|
|
||||||
<target name="clean">
|
<target name="clean">
|
||||||
<delete dir="build"/>
|
<delete dir="build"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="compile">
|
<target name="compile">
|
||||||
<mkdir dir="build/classes"/>
|
<mkdir dir="build/classes"/>
|
||||||
<javac destdir="build/classes" classpath="lib/junit.jar:lib/annotations.jar">
|
<javac destdir="build/classes" classpath="lib/junit.jar:lib/annotations.jar">
|
||||||
<src path="src"/>
|
<src path="src"/>
|
||||||
</javac>
|
</javac>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="jar" depends="compile">
|
<target name="jar" depends="compile">
|
||||||
<mkdir dir="build/jar"/>
|
<mkdir dir="build/jar"/>
|
||||||
<jar destfile="../gcc_map_reader.jar" basedir="build/classes">
|
<jar destfile="../gcc_map_reader.jar" basedir="build/classes">
|
||||||
<manifest>
|
<manifest>
|
||||||
<attribute name="Main-Class" value="rusefi.GccMapReader"/>
|
<attribute name="Main-Class" value="rusefi.GccMapReader"/>
|
||||||
</manifest>
|
</manifest>
|
||||||
<zipfileset dir="build/classes" includes="**/*.class"/>
|
<zipfileset dir="build/classes" includes="**/*.class"/>
|
||||||
</jar>
|
</jar>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="run" depends="jar">
|
<target name="run" depends="jar">
|
||||||
<java jar="../java_console_binary/rusefi_console.jar" fork="true"/>
|
<java jar="../java_console_binary/rusefi_console.jar" fork="true"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module type="JAVA_MODULE" version="4">
|
<module type="JAVA_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,165 +1,165 @@
|
||||||
package rusefi;
|
package rusefi;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is an utility to print the information from GCC linked .map file
|
* This is an utility to print the information from GCC linked .map file
|
||||||
*
|
*
|
||||||
* @author Andrey Belomutskiy
|
* @author Andrey Belomutskiy
|
||||||
* 10/16/13
|
* 10/16/13
|
||||||
*/
|
*/
|
||||||
public class GccMapReader {
|
public class GccMapReader {
|
||||||
private static final Pattern p2 = Pattern.compile(".*0x(\\S*)(.*)");
|
private static final Pattern p2 = Pattern.compile(".*0x(\\S*)(.*)");
|
||||||
|
|
||||||
public static void main(String[] args) throws IOException {
|
public static void main(String[] args) throws IOException {
|
||||||
if (args.length!=1) {
|
if (args.length!=1) {
|
||||||
System.err.println("file name parameter expected");
|
System.err.println("file name parameter expected");
|
||||||
System.exit(-1);
|
System.exit(-1);
|
||||||
}
|
}
|
||||||
String fileName = args[0];
|
String fileName = args[0];
|
||||||
BufferedReader fr = new BufferedReader(new FileReader(fileName));
|
BufferedReader fr = new BufferedReader(new FileReader(fileName));
|
||||||
|
|
||||||
String line;
|
String line;
|
||||||
List<String> lines = new ArrayList<String>();
|
List<String> lines = new ArrayList<String>();
|
||||||
|
|
||||||
while ((line = fr.readLine()) != null)
|
while ((line = fr.readLine()) != null)
|
||||||
lines.add(line);
|
lines.add(line);
|
||||||
|
|
||||||
debug("Got " + lines.size() + " lines");
|
debug("Got " + lines.size() + " lines");
|
||||||
|
|
||||||
List<Record> records = process(lines);
|
List<Record> records = process(lines);
|
||||||
|
|
||||||
Collections.sort(records, new Comparator<Record>() {
|
Collections.sort(records, new Comparator<Record>() {
|
||||||
@Override
|
@Override
|
||||||
public int compare(Record o1, Record o2) {
|
public int compare(Record o1, Record o2) {
|
||||||
return o2.compareTo(o1);
|
return o2.compareTo(o1);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
int totalSize = 0;
|
int totalSize = 0;
|
||||||
for (Record record : records) {
|
for (Record record : records) {
|
||||||
System.out.println(record);
|
System.out.println(record);
|
||||||
totalSize += record.size;
|
totalSize += record.size;
|
||||||
}
|
}
|
||||||
|
|
||||||
System.out.println("Total size: " + totalSize);
|
System.out.println("Total size: " + totalSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<Record> process(List<String> lines) {
|
private static List<Record> process(List<String> lines) {
|
||||||
Pattern p1 = Pattern.compile(".*\\.bss\\.(\\S*).*0x.*0x(\\S*)(.*)");
|
Pattern p1 = Pattern.compile(".*\\.bss\\.(\\S*).*0x.*0x(\\S*)(.*)");
|
||||||
|
|
||||||
|
|
||||||
List<Record> result = new ArrayList<Record>();
|
List<Record> result = new ArrayList<Record>();
|
||||||
for (int i = 0; i < lines.size(); i++) {
|
for (int i = 0; i < lines.size(); i++) {
|
||||||
String line = lines.get(i);
|
String line = lines.get(i);
|
||||||
if (!line.contains(".bss."))
|
if (!line.contains(".bss."))
|
||||||
continue;
|
continue;
|
||||||
debug(line);
|
debug(line);
|
||||||
|
|
||||||
Matcher m1 = p1.matcher(line);
|
Matcher m1 = p1.matcher(line);
|
||||||
|
|
||||||
if (m1.matches()) {
|
if (m1.matches()) {
|
||||||
parseSingleLine(result, line, m1, i);
|
parseSingleLine(result, line, m1, i);
|
||||||
} else {
|
} else {
|
||||||
i = parseMultiLine(lines, result, i, line);
|
i = parseMultiLine(lines, result, i, line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static int parseMultiLine(List<String> lines, List<Record> result, int lineIndex, String line) {
|
private static int parseMultiLine(List<String> lines, List<Record> result, int lineIndex, String line) {
|
||||||
debug("Multi-line " + line);
|
debug("Multi-line " + line);
|
||||||
String suffix = line;
|
String suffix = line;
|
||||||
line = lines.get(++lineIndex);
|
line = lines.get(++lineIndex);
|
||||||
|
|
||||||
Matcher m2 = p2.matcher(line);
|
Matcher m2 = p2.matcher(line);
|
||||||
|
|
||||||
if (!m2.matches()) {
|
if (!m2.matches()) {
|
||||||
debug("Skipping " + line);
|
debug("Skipping " + line);
|
||||||
return lineIndex;
|
return lineIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
String sizeString = m2.group(1);
|
String sizeString = m2.group(1);
|
||||||
String prefix = m2.group(2);
|
String prefix = m2.group(2);
|
||||||
|
|
||||||
debug("Next line " + line);
|
debug("Next line " + line);
|
||||||
|
|
||||||
String name = prefix + "@" + suffix;
|
String name = prefix + "@" + suffix;
|
||||||
|
|
||||||
if (line.contains("ALIGN")) {
|
if (line.contains("ALIGN")) {
|
||||||
System.out.println("TODO: better handle " + line);
|
System.out.println("TODO: better handle " + line);
|
||||||
return lineIndex;
|
return lineIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
int size;
|
int size;
|
||||||
try {
|
try {
|
||||||
size = Integer.parseInt(sizeString, 16);
|
size = Integer.parseInt(sizeString, 16);
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
throw new IllegalStateException("While parsing @ " + lineIndex);
|
throw new IllegalStateException("While parsing @ " + lineIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
debug("Name " + name);
|
debug("Name " + name);
|
||||||
debug("size " + size);
|
debug("size " + size);
|
||||||
|
|
||||||
result.add(new Record(size, name));
|
result.add(new Record(size, name));
|
||||||
return lineIndex;
|
return lineIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void parseSingleLine(List<Record> result, String line, Matcher m1, int lineIndex) {
|
private static void parseSingleLine(List<Record> result, String line, Matcher m1, int lineIndex) {
|
||||||
debug("Single-line " + line);
|
debug("Single-line " + line);
|
||||||
|
|
||||||
String suffix = m1.group(1);
|
String suffix = m1.group(1);
|
||||||
String sizeString = m1.group(2);
|
String sizeString = m1.group(2);
|
||||||
String prefix = m1.group(3);
|
String prefix = m1.group(3);
|
||||||
|
|
||||||
String name = prefix + "@" + suffix;
|
String name = prefix + "@" + suffix;
|
||||||
|
|
||||||
int size;
|
int size;
|
||||||
try {
|
try {
|
||||||
size = Integer.parseInt(sizeString, 16);
|
size = Integer.parseInt(sizeString, 16);
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
throw new IllegalStateException("While parsing @ " + lineIndex);
|
throw new IllegalStateException("While parsing @ " + lineIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
debug("Name " + name);
|
debug("Name " + name);
|
||||||
debug("size " + size);
|
debug("size " + size);
|
||||||
|
|
||||||
result.add(new Record(size, name));
|
result.add(new Record(size, name));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void debug(String s) {
|
private static void debug(String s) {
|
||||||
// System.out.println(s);
|
// System.out.println(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
static class Record implements Comparable<Record> {
|
static class Record implements Comparable<Record> {
|
||||||
private final int size;
|
private final int size;
|
||||||
private final String name;
|
private final String name;
|
||||||
|
|
||||||
public Record(int size, String name) {
|
public Record(int size, String name) {
|
||||||
this.size = size;
|
this.size = size;
|
||||||
this.name = name;
|
this.name = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int compareTo(Record o) {
|
public int compareTo(Record o) {
|
||||||
int d = size - o.size;
|
int d = size - o.size;
|
||||||
if (d != 0)
|
if (d != 0)
|
||||||
return d;
|
return d;
|
||||||
return name.compareTo(o.name);
|
return name.compareTo(o.name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "Record{" +
|
return "Record{" +
|
||||||
"size=" + size +
|
"size=" + size +
|
||||||
", name='" + name + '\'' +
|
", name='" + name + '\'' +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,23 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="CompilerConfiguration">
|
<component name="CompilerConfiguration">
|
||||||
<option name="DEFAULT_COMPILER" value="Javac" />
|
<option name="DEFAULT_COMPILER" value="Javac" />
|
||||||
<resourceExtensions />
|
<resourceExtensions />
|
||||||
<wildcardResourcePatterns>
|
<wildcardResourcePatterns>
|
||||||
<entry name="!?*.java" />
|
<entry name="!?*.java" />
|
||||||
<entry name="!?*.form" />
|
<entry name="!?*.form" />
|
||||||
<entry name="!?*.class" />
|
<entry name="!?*.class" />
|
||||||
<entry name="!?*.groovy" />
|
<entry name="!?*.groovy" />
|
||||||
<entry name="!?*.scala" />
|
<entry name="!?*.scala" />
|
||||||
<entry name="!?*.flex" />
|
<entry name="!?*.flex" />
|
||||||
<entry name="!?*.kt" />
|
<entry name="!?*.kt" />
|
||||||
<entry name="!?*.clj" />
|
<entry name="!?*.clj" />
|
||||||
</wildcardResourcePatterns>
|
</wildcardResourcePatterns>
|
||||||
<annotationProcessing>
|
<annotationProcessing>
|
||||||
<profile default="true" name="Default" enabled="false">
|
<profile default="true" name="Default" enabled="false">
|
||||||
<processorPath useClasspath="true" />
|
<processorPath useClasspath="true" />
|
||||||
</profile>
|
</profile>
|
||||||
</annotationProcessing>
|
</annotationProcessing>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<component name="CopyrightManager">
|
<component name="CopyrightManager">
|
||||||
<settings default="">
|
<settings default="">
|
||||||
<module2copyright />
|
<module2copyright />
|
||||||
</settings>
|
</settings>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
|
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="EntryPointsManager">
|
<component name="EntryPointsManager">
|
||||||
<entry_points version="2.0" />
|
<entry_points version="2.0" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/out" />
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
</component>
|
</component>
|
||||||
<component name="SvnBranchConfigurationManager">
|
<component name="SvnBranchConfigurationManager">
|
||||||
<option name="mySupportsUserInfoFilter" value="true" />
|
<option name="mySupportsUserInfoFilter" value="true" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ProjectModuleManager">
|
<component name="ProjectModuleManager">
|
||||||
<modules>
|
<modules>
|
||||||
<module fileurl="file://$PROJECT_DIR$/net_list_merge.iml" filepath="$PROJECT_DIR$/net_list_merge.iml" />
|
<module fileurl="file://$PROJECT_DIR$/net_list_merge.iml" filepath="$PROJECT_DIR$/net_list_merge.iml" />
|
||||||
</modules>
|
</modules>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<component name="DependencyValidationManager">
|
<component name="DependencyValidationManager">
|
||||||
<state>
|
<state>
|
||||||
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
|
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
|
||||||
</state>
|
</state>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,125 +1,125 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="Palette2">
|
<component name="Palette2">
|
||||||
<group name="Swing">
|
<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">
|
<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" />
|
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
|
||||||
</item>
|
</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">
|
<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" />
|
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
|
<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" />
|
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="Button" />
|
<property name="text" value="Button" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="RadioButton" />
|
<property name="text" value="RadioButton" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="CheckBox" />
|
<property name="text" value="CheckBox" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="Label" />
|
<property name="text" value="Label" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
<preferred-size width="150" height="-1" />
|
<preferred-size width="150" height="-1" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
<preferred-size width="150" height="-1" />
|
<preferred-size width="150" height="-1" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
<preferred-size width="150" height="-1" />
|
<preferred-size width="150" height="-1" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||||
<preferred-size width="200" height="200" />
|
<preferred-size width="200" height="200" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||||
<preferred-size width="200" height="200" />
|
<preferred-size width="200" height="200" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
|
||||||
<preferred-size width="-1" height="20" />
|
<preferred-size width="-1" height="20" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
|
||||||
</item>
|
</item>
|
||||||
</group>
|
</group>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="VcsDirectoryMappings">
|
<component name="VcsDirectoryMappings">
|
||||||
<mapping directory="" vcs="svn" />
|
<mapping directory="" vcs="svn" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,494 +1,494 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" readonly="true" id="4d0f1321-4620-4101-a21a-49927b2a9419" name="Default" comment="">
|
<list default="true" readonly="true" id="4d0f1321-4620-4101-a21a-49927b2a9419" name="Default" comment="">
|
||||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/rusefi/NetListMergeUtil.java" />
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/rusefi/NetListMergeUtil.java" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$" afterPath="$PROJECT_DIR$" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$" afterPath="$PROJECT_DIR$" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/rusefi/NetListMerge.java" afterPath="$PROJECT_DIR$/src/rusefi/NetListMerge.java" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/rusefi/NetListMerge.java" afterPath="$PROJECT_DIR$/src/rusefi/NetListMerge.java" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||||
</list>
|
</list>
|
||||||
<ignored path="net_list_merge.iws" />
|
<ignored path="net_list_merge.iws" />
|
||||||
<ignored path=".idea/workspace.xml" />
|
<ignored path=".idea/workspace.xml" />
|
||||||
<file path="/NetListMerge.java" changelist="4d0f1321-4620-4101-a21a-49927b2a9419" time="1386563096595" ignored="false" />
|
<file path="/NetListMerge.java" changelist="4d0f1321-4620-4101-a21a-49927b2a9419" time="1386563096595" ignored="false" />
|
||||||
<file path="/fragment.java" changelist="4d0f1321-4620-4101-a21a-49927b2a9419" time="1386562535344" ignored="false" />
|
<file path="/fragment.java" changelist="4d0f1321-4620-4101-a21a-49927b2a9419" time="1386562535344" ignored="false" />
|
||||||
<option name="TRACKING_ENABLED" value="true" />
|
<option name="TRACKING_ENABLED" value="true" />
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
|
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
|
||||||
<component name="CreatePatchCommitExecutor">
|
<component name="CreatePatchCommitExecutor">
|
||||||
<option name="PATCH_PATH" value="" />
|
<option name="PATCH_PATH" value="" />
|
||||||
</component>
|
</component>
|
||||||
<component name="DaemonCodeAnalyzer">
|
<component name="DaemonCodeAnalyzer">
|
||||||
<disable_hints />
|
<disable_hints />
|
||||||
</component>
|
</component>
|
||||||
<component name="DebuggerManager">
|
<component name="DebuggerManager">
|
||||||
<breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
|
<breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
|
||||||
<breakpoint>
|
<breakpoint>
|
||||||
<option name="NOTIFY_CAUGHT" value="true" />
|
<option name="NOTIFY_CAUGHT" value="true" />
|
||||||
<option name="NOTIFY_UNCAUGHT" value="true" />
|
<option name="NOTIFY_UNCAUGHT" value="true" />
|
||||||
<option name="ENABLED" value="false" />
|
<option name="ENABLED" value="false" />
|
||||||
<option name="LOG_ENABLED" value="false" />
|
<option name="LOG_ENABLED" value="false" />
|
||||||
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
||||||
<option name="REMOVE_AFTER_HIT" value="false" />
|
<option name="REMOVE_AFTER_HIT" value="false" />
|
||||||
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
||||||
<option name="SUSPEND" value="true" />
|
<option name="SUSPEND" value="true" />
|
||||||
<option name="COUNT_FILTER_ENABLED" value="false" />
|
<option name="COUNT_FILTER_ENABLED" value="false" />
|
||||||
<option name="COUNT_FILTER" value="0" />
|
<option name="COUNT_FILTER" value="0" />
|
||||||
<option name="CONDITION_ENABLED" value="true" />
|
<option name="CONDITION_ENABLED" value="true" />
|
||||||
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
||||||
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
||||||
<option name="CONDITION" value="" />
|
<option name="CONDITION" value="" />
|
||||||
<option name="LOG_MESSAGE" value="" />
|
<option name="LOG_MESSAGE" value="" />
|
||||||
</breakpoint>
|
</breakpoint>
|
||||||
<breakpoint>
|
<breakpoint>
|
||||||
<option name="NOTIFY_CAUGHT" value="true" />
|
<option name="NOTIFY_CAUGHT" value="true" />
|
||||||
<option name="NOTIFY_UNCAUGHT" value="true" />
|
<option name="NOTIFY_UNCAUGHT" value="true" />
|
||||||
<option name="ENABLED" value="false" />
|
<option name="ENABLED" value="false" />
|
||||||
<option name="LOG_ENABLED" value="false" />
|
<option name="LOG_ENABLED" value="false" />
|
||||||
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
<option name="LOG_EXPRESSION_ENABLED" value="false" />
|
||||||
<option name="REMOVE_AFTER_HIT" value="false" />
|
<option name="REMOVE_AFTER_HIT" value="false" />
|
||||||
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
<option name="SUSPEND_POLICY" value="SuspendAll" />
|
||||||
<option name="SUSPEND" value="true" />
|
<option name="SUSPEND" value="true" />
|
||||||
<option name="COUNT_FILTER_ENABLED" value="false" />
|
<option name="COUNT_FILTER_ENABLED" value="false" />
|
||||||
<option name="COUNT_FILTER" value="0" />
|
<option name="COUNT_FILTER" value="0" />
|
||||||
<option name="CONDITION_ENABLED" value="true" />
|
<option name="CONDITION_ENABLED" value="true" />
|
||||||
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
<option name="CLASS_FILTERS_ENABLED" value="false" />
|
||||||
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
|
||||||
<option name="CONDITION" value="" />
|
<option name="CONDITION" value="" />
|
||||||
<option name="LOG_MESSAGE" value="" />
|
<option name="LOG_MESSAGE" value="" />
|
||||||
</breakpoint>
|
</breakpoint>
|
||||||
</breakpoint_any>
|
</breakpoint_any>
|
||||||
<ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
|
<ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
|
||||||
<breakpoint_rules />
|
<breakpoint_rules />
|
||||||
<ui_properties />
|
<ui_properties />
|
||||||
</component>
|
</component>
|
||||||
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
|
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
|
||||||
<component name="FavoritesManager">
|
<component name="FavoritesManager">
|
||||||
<favorites_list name="net_list_merge" />
|
<favorites_list name="net_list_merge" />
|
||||||
</component>
|
</component>
|
||||||
<component name="FileEditorManager">
|
<component name="FileEditorManager">
|
||||||
<leaf>
|
<leaf>
|
||||||
<file leaf-file-name="NetListMerge.java" pinned="false" current="true" current-in-tab="true">
|
<file leaf-file-name="NetListMerge.java" pinned="false" current="true" current-in-tab="true">
|
||||||
<entry file="file://$PROJECT_DIR$/src/rusefi/NetListMerge.java">
|
<entry file="file://$PROJECT_DIR$/src/rusefi/NetListMerge.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="50" column="79" selection-start="2052" selection-end="2052" vertical-scroll-proportion="0.52737224">
|
<state line="50" column="79" selection-start="2052" selection-end="2052" vertical-scroll-proportion="0.52737224">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="NetListMergeUtil.java" pinned="false" current="false" current-in-tab="false">
|
<file leaf-file-name="NetListMergeUtil.java" pinned="false" current="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/src/rusefi/NetListMergeUtil.java">
|
<entry file="file://$PROJECT_DIR$/src/rusefi/NetListMergeUtil.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="36" column="23" selection-start="1045" selection-end="1045" vertical-scroll-proportion="0.0">
|
<state line="36" column="23" selection-start="1045" selection-end="1045" vertical-scroll-proportion="0.0">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="Pattern.java" pinned="false" current="false" current-in-tab="false">
|
<file leaf-file-name="Pattern.java" pinned="false" current="false" current-in-tab="false">
|
||||||
<entry file="jar://C:/Program Files/Java/jdk1.7.0_45/src.zip!/java/util/regex/Pattern.java">
|
<entry file="jar://C:/Program Files/Java/jdk1.7.0_45/src.zip!/java/util/regex/Pattern.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="4169" column="0" selection-start="152719" selection-end="152719" vertical-scroll-proportion="0.0">
|
<state line="4169" column="0" selection-start="152719" selection-end="152719" vertical-scroll-proportion="0.0">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="Matcher.java" pinned="false" current="false" current-in-tab="false">
|
<file leaf-file-name="Matcher.java" pinned="false" current="false" current-in-tab="false">
|
||||||
<entry file="jar://C:/Program Files/Java/jdk1.7.0_45/src.zip!/java/util/regex/Matcher.java">
|
<entry file="jar://C:/Program Files/Java/jdk1.7.0_45/src.zip!/java/util/regex/Matcher.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="576" column="19" selection-start="20769" selection-end="20769" vertical-scroll-proportion="0.0">
|
<state line="576" column="19" selection-start="20769" selection-end="20769" vertical-scroll-proportion="0.0">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
</leaf>
|
</leaf>
|
||||||
</component>
|
</component>
|
||||||
<component name="FindManager">
|
<component name="FindManager">
|
||||||
<FindUsagesManager>
|
<FindUsagesManager>
|
||||||
<setting name="OPEN_NEW_TAB" value="false" />
|
<setting name="OPEN_NEW_TAB" value="false" />
|
||||||
</FindUsagesManager>
|
</FindUsagesManager>
|
||||||
</component>
|
</component>
|
||||||
<component name="IdeDocumentHistory">
|
<component name="IdeDocumentHistory">
|
||||||
<option name="changedFiles">
|
<option name="changedFiles">
|
||||||
<list>
|
<list>
|
||||||
<option value="$PROJECT_DIR$/src/rusefi/NetListMerge.java" />
|
<option value="$PROJECT_DIR$/src/rusefi/NetListMerge.java" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectFrameBounds">
|
<component name="ProjectFrameBounds">
|
||||||
<option name="x" value="-9" />
|
<option name="x" value="-9" />
|
||||||
<option name="y" value="-9" />
|
<option name="y" value="-9" />
|
||||||
<option name="width" value="1698" />
|
<option name="width" value="1698" />
|
||||||
<option name="height" value="1020" />
|
<option name="height" value="1020" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
||||||
<OptionsSetting value="true" id="Add" />
|
<OptionsSetting value="true" id="Add" />
|
||||||
<OptionsSetting value="true" id="Remove" />
|
<OptionsSetting value="true" id="Remove" />
|
||||||
<OptionsSetting value="true" id="Checkout" />
|
<OptionsSetting value="true" id="Checkout" />
|
||||||
<OptionsSetting value="true" id="Update" />
|
<OptionsSetting value="true" id="Update" />
|
||||||
<OptionsSetting value="true" id="Status" />
|
<OptionsSetting value="true" id="Status" />
|
||||||
<OptionsSetting value="true" id="Edit" />
|
<OptionsSetting value="true" id="Edit" />
|
||||||
<ConfirmationsSetting value="0" id="Add" />
|
<ConfirmationsSetting value="0" id="Add" />
|
||||||
<ConfirmationsSetting value="0" id="Remove" />
|
<ConfirmationsSetting value="0" id="Remove" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectReloadState">
|
<component name="ProjectReloadState">
|
||||||
<option name="STATE" value="0" />
|
<option name="STATE" value="0" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectView">
|
<component name="ProjectView">
|
||||||
<navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
|
<navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
|
||||||
<flattenPackages />
|
<flattenPackages />
|
||||||
<showMembers />
|
<showMembers />
|
||||||
<showModules />
|
<showModules />
|
||||||
<showLibraryContents />
|
<showLibraryContents />
|
||||||
<hideEmptyPackages />
|
<hideEmptyPackages />
|
||||||
<abbreviatePackageNames />
|
<abbreviatePackageNames />
|
||||||
<autoscrollToSource />
|
<autoscrollToSource />
|
||||||
<autoscrollFromSource />
|
<autoscrollFromSource />
|
||||||
<sortByType />
|
<sortByType />
|
||||||
</navigator>
|
</navigator>
|
||||||
<panes>
|
<panes>
|
||||||
<pane id="Scope" />
|
<pane id="Scope" />
|
||||||
<pane id="ProjectPane">
|
<pane id="ProjectPane">
|
||||||
<subPane>
|
<subPane>
|
||||||
<PATH>
|
<PATH>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="net_list_merge" />
|
<option name="myItemId" value="net_list_merge" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
<PATH>
|
<PATH>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="net_list_merge" />
|
<option name="myItemId" value="net_list_merge" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="net_list_merge" />
|
<option name="myItemId" value="net_list_merge" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
<PATH>
|
<PATH>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="net_list_merge" />
|
<option name="myItemId" value="net_list_merge" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="net_list_merge" />
|
<option name="myItemId" value="net_list_merge" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="src" />
|
<option name="myItemId" value="src" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="rusefi" />
|
<option name="myItemId" value="rusefi" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
</subPane>
|
</subPane>
|
||||||
</pane>
|
</pane>
|
||||||
<pane id="PackagesPane" />
|
<pane id="PackagesPane" />
|
||||||
</panes>
|
</panes>
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
<property name="GoToFile.includeJavaFiles" value="false" />
|
<property name="GoToFile.includeJavaFiles" value="false" />
|
||||||
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
|
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
|
||||||
<property name="recentsLimit" value="5" />
|
<property name="recentsLimit" value="5" />
|
||||||
<property name="MemberChooser.sorted" value="false" />
|
<property name="MemberChooser.sorted" value="false" />
|
||||||
<property name="restartRequiresConfirmation" value="true" />
|
<property name="restartRequiresConfirmation" value="true" />
|
||||||
<property name="MemberChooser.showClasses" value="true" />
|
<property name="MemberChooser.showClasses" value="true" />
|
||||||
<property name="GoToClass.includeLibraries" value="false" />
|
<property name="GoToClass.includeLibraries" value="false" />
|
||||||
<property name="dynamic.classpath" value="false" />
|
<property name="dynamic.classpath" value="false" />
|
||||||
<property name="MemberChooser.copyJavadoc" value="false" />
|
<property name="MemberChooser.copyJavadoc" value="false" />
|
||||||
</component>
|
</component>
|
||||||
<component name="RecentsManager">
|
<component name="RecentsManager">
|
||||||
<key name="MoveMembersDialog.RECENTS_KEY">
|
<key name="MoveMembersDialog.RECENTS_KEY">
|
||||||
<recent name="rusefi.NetListMergeUtil" />
|
<recent name="rusefi.NetListMergeUtil" />
|
||||||
</key>
|
</key>
|
||||||
</component>
|
</component>
|
||||||
<component name="RunManager" selected="Application.NetListMerge">
|
<component name="RunManager" selected="Application.NetListMerge">
|
||||||
<configuration default="false" name="NetListMerge" type="Application" factoryName="Application" temporary="true">
|
<configuration default="false" name="NetListMerge" type="Application" factoryName="Application" temporary="true">
|
||||||
<option name="MAIN_CLASS_NAME" value="rusefi.NetListMerge" />
|
<option name="MAIN_CLASS_NAME" value="rusefi.NetListMerge" />
|
||||||
<option name="VM_PARAMETERS" value="" />
|
<option name="VM_PARAMETERS" value="" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="dest.net s.net" />
|
<option name="PROGRAM_PARAMETERS" value="dest.net s.net" />
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<module name="net_list_merge" />
|
<module name="net_list_merge" />
|
||||||
<envs />
|
<envs />
|
||||||
<RunnerSettings RunnerId="Debug">
|
<RunnerSettings RunnerId="Debug">
|
||||||
<option name="DEBUG_PORT" value="" />
|
<option name="DEBUG_PORT" value="" />
|
||||||
<option name="TRANSPORT" value="0" />
|
<option name="TRANSPORT" value="0" />
|
||||||
<option name="LOCAL" value="true" />
|
<option name="LOCAL" value="true" />
|
||||||
</RunnerSettings>
|
</RunnerSettings>
|
||||||
<RunnerSettings RunnerId="Profile ">
|
<RunnerSettings RunnerId="Profile ">
|
||||||
<option name="myExternalizedOptions" value=" additional-options2=onexit\=snapshot " />
|
<option name="myExternalizedOptions" value=" additional-options2=onexit\=snapshot " />
|
||||||
</RunnerSettings>
|
</RunnerSettings>
|
||||||
<RunnerSettings RunnerId="Run" />
|
<RunnerSettings RunnerId="Run" />
|
||||||
<ConfigurationWrapper RunnerId="Debug" />
|
<ConfigurationWrapper RunnerId="Debug" />
|
||||||
<ConfigurationWrapper RunnerId="Run" />
|
<ConfigurationWrapper RunnerId="Run" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
|
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
|
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
|
||||||
<option name="PROGRAM_PARAMETERS" />
|
<option name="PROGRAM_PARAMETERS" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="Remote" factoryName="Remote">
|
<configuration default="true" type="Remote" factoryName="Remote">
|
||||||
<option name="USE_SOCKET_TRANSPORT" value="true" />
|
<option name="USE_SOCKET_TRANSPORT" value="true" />
|
||||||
<option name="SERVER_MODE" value="false" />
|
<option name="SERVER_MODE" value="false" />
|
||||||
<option name="SHMEM_ADDRESS" value="javadebug" />
|
<option name="SHMEM_ADDRESS" value="javadebug" />
|
||||||
<option name="HOST" value="localhost" />
|
<option name="HOST" value="localhost" />
|
||||||
<option name="PORT" value="5005" />
|
<option name="PORT" value="5005" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="Applet" factoryName="Applet">
|
<configuration default="true" type="Applet" factoryName="Applet">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="HTML_FILE_NAME" />
|
<option name="HTML_FILE_NAME" />
|
||||||
<option name="HTML_USED" value="false" />
|
<option name="HTML_USED" value="false" />
|
||||||
<option name="WIDTH" value="400" />
|
<option name="WIDTH" value="400" />
|
||||||
<option name="HEIGHT" value="300" />
|
<option name="HEIGHT" value="300" />
|
||||||
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
|
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
|
||||||
<option name="VM_PARAMETERS" />
|
<option name="VM_PARAMETERS" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="TestNG" factoryName="TestNG">
|
<configuration default="true" type="TestNG" factoryName="TestNG">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<option name="SUITE_NAME" />
|
<option name="SUITE_NAME" />
|
||||||
<option name="PACKAGE_NAME" />
|
<option name="PACKAGE_NAME" />
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="METHOD_NAME" />
|
<option name="METHOD_NAME" />
|
||||||
<option name="GROUP_NAME" />
|
<option name="GROUP_NAME" />
|
||||||
<option name="TEST_OBJECT" value="CLASS" />
|
<option name="TEST_OBJECT" value="CLASS" />
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
<option name="VM_PARAMETERS" value="-ea" />
|
||||||
<option name="PARAMETERS" />
|
<option name="PARAMETERS" />
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
<option name="OUTPUT_DIRECTORY" />
|
<option name="OUTPUT_DIRECTORY" />
|
||||||
<option name="ANNOTATION_TYPE" />
|
<option name="ANNOTATION_TYPE" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
<option name="TEST_SEARCH_SCOPE">
|
||||||
<value defaultName="moduleWithDependencies" />
|
<value defaultName="moduleWithDependencies" />
|
||||||
</option>
|
</option>
|
||||||
<option name="USE_DEFAULT_REPORTERS" value="false" />
|
<option name="USE_DEFAULT_REPORTERS" value="false" />
|
||||||
<option name="PROPERTIES_FILE" />
|
<option name="PROPERTIES_FILE" />
|
||||||
<envs />
|
<envs />
|
||||||
<properties />
|
<properties />
|
||||||
<listeners />
|
<listeners />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="Application" factoryName="Application">
|
<configuration default="true" type="Application" factoryName="Application">
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="VM_PARAMETERS" />
|
<option name="VM_PARAMETERS" />
|
||||||
<option name="PROGRAM_PARAMETERS" />
|
<option name="PROGRAM_PARAMETERS" />
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<envs />
|
<envs />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="JUnit" factoryName="JUnit">
|
<configuration default="true" type="JUnit" factoryName="JUnit">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<option name="PACKAGE_NAME" />
|
<option name="PACKAGE_NAME" />
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="METHOD_NAME" />
|
<option name="METHOD_NAME" />
|
||||||
<option name="TEST_OBJECT" value="class" />
|
<option name="TEST_OBJECT" value="class" />
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
<option name="VM_PARAMETERS" value="-ea" />
|
||||||
<option name="PARAMETERS" />
|
<option name="PARAMETERS" />
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
<option name="TEST_SEARCH_SCOPE">
|
||||||
<value defaultName="moduleWithDependencies" />
|
<value defaultName="moduleWithDependencies" />
|
||||||
</option>
|
</option>
|
||||||
<envs />
|
<envs />
|
||||||
<patterns />
|
<patterns />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<list size="1">
|
<list size="1">
|
||||||
<item index="0" class="java.lang.String" itemvalue="Application.NetListMerge" />
|
<item index="0" class="java.lang.String" itemvalue="Application.NetListMerge" />
|
||||||
</list>
|
</list>
|
||||||
<recent_temporary>
|
<recent_temporary>
|
||||||
<list size="1">
|
<list size="1">
|
||||||
<item index="0" class="java.lang.String" itemvalue="Application.NetListMerge" />
|
<item index="0" class="java.lang.String" itemvalue="Application.NetListMerge" />
|
||||||
</list>
|
</list>
|
||||||
</recent_temporary>
|
</recent_temporary>
|
||||||
<configuration name="<template>" type="WebApp" default="true" selected="false">
|
<configuration name="<template>" type="WebApp" default="true" selected="false">
|
||||||
<Host>localhost</Host>
|
<Host>localhost</Host>
|
||||||
<Port>5050</Port>
|
<Port>5050</Port>
|
||||||
</configuration>
|
</configuration>
|
||||||
</component>
|
</component>
|
||||||
<component name="ShelveChangesManager" show_recycled="false" />
|
<component name="ShelveChangesManager" show_recycled="false" />
|
||||||
<component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="true" SSL_PROTOCOLS="all">
|
<component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="true" SSL_PROTOCOLS="all">
|
||||||
<option name="USER" value="" />
|
<option name="USER" value="" />
|
||||||
<option name="PASSWORD" value="" />
|
<option name="PASSWORD" value="" />
|
||||||
<option name="mySSHConnectionTimeout" value="30000" />
|
<option name="mySSHConnectionTimeout" value="30000" />
|
||||||
<option name="mySSHReadTimeout" value="30000" />
|
<option name="mySSHReadTimeout" value="30000" />
|
||||||
<option name="LAST_MERGED_REVISION" />
|
<option name="LAST_MERGED_REVISION" />
|
||||||
<option name="MERGE_DRY_RUN" value="false" />
|
<option name="MERGE_DRY_RUN" value="false" />
|
||||||
<option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
|
<option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
|
||||||
<option name="UPDATE_LOCK_ON_DEMAND" value="false" />
|
<option name="UPDATE_LOCK_ON_DEMAND" value="false" />
|
||||||
<option name="IGNORE_SPACES_IN_MERGE" value="false" />
|
<option name="IGNORE_SPACES_IN_MERGE" value="false" />
|
||||||
<option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
|
<option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
|
||||||
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
|
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
|
||||||
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
|
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
|
||||||
<option name="FORCE_UPDATE" value="false" />
|
<option name="FORCE_UPDATE" value="false" />
|
||||||
<option name="IGNORE_EXTERNALS" value="false" />
|
<option name="IGNORE_EXTERNALS" value="false" />
|
||||||
<configuration useDefault="false">C:\Users\pc\AppData\Roaming\Subversion</configuration>
|
<configuration useDefault="false">C:\Users\pc\AppData\Roaming\Subversion</configuration>
|
||||||
<myIsUseDefaultProxy>false</myIsUseDefaultProxy>
|
<myIsUseDefaultProxy>false</myIsUseDefaultProxy>
|
||||||
<supportedVersion>125</supportedVersion>
|
<supportedVersion>125</supportedVersion>
|
||||||
</component>
|
</component>
|
||||||
<component name="TaskManager">
|
<component name="TaskManager">
|
||||||
<task active="true" id="Default" summary="Default task">
|
<task active="true" id="Default" summary="Default task">
|
||||||
<changelist id="4d0f1321-4620-4101-a21a-49927b2a9419" name="Default" comment="" />
|
<changelist id="4d0f1321-4620-4101-a21a-49927b2a9419" name="Default" comment="" />
|
||||||
<created>1386559155621</created>
|
<created>1386559155621</created>
|
||||||
<updated>1386559155621</updated>
|
<updated>1386559155621</updated>
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="ToolWindowManager">
|
<component name="ToolWindowManager">
|
||||||
<frame x="-9" y="-9" width="1698" height="1020" extended-state="6" />
|
<frame x="-9" y="-9" width="1698" height="1020" extended-state="6" />
|
||||||
<editor active="true" />
|
<editor active="true" />
|
||||||
<layout>
|
<layout>
|
||||||
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
<window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943925" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943925" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3995327" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3995327" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
|
||||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
|
||||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943925" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943925" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.249694" sideWeight="0.6705608" order="0" side_tool="false" content_ui="combo" />
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.249694" sideWeight="0.6705608" order="0" side_tool="false" content_ui="combo" />
|
||||||
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32943925" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32943925" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
||||||
</layout>
|
</layout>
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsContentAnnotationSettings">
|
<component name="VcsContentAnnotationSettings">
|
||||||
<option name="myLimit" value="2678400000" />
|
<option name="myLimit" value="2678400000" />
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
|
<option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
|
||||||
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
|
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
|
||||||
<option name="CHECK_NEW_TODO" value="true" />
|
<option name="CHECK_NEW_TODO" value="true" />
|
||||||
<option name="myTodoPanelSettings">
|
<option name="myTodoPanelSettings">
|
||||||
<value>
|
<value>
|
||||||
<are-packages-shown value="false" />
|
<are-packages-shown value="false" />
|
||||||
<are-modules-shown value="false" />
|
<are-modules-shown value="false" />
|
||||||
<flatten-packages value="false" />
|
<flatten-packages value="false" />
|
||||||
<is-autoscroll-to-source value="false" />
|
<is-autoscroll-to-source value="false" />
|
||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
<option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
|
<option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
|
||||||
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
|
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
|
||||||
<option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
|
<option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
|
||||||
<option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
|
<option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
|
||||||
<option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
|
<option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
|
||||||
<option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
|
<option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
|
||||||
<option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
|
<option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
|
||||||
<option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
|
<option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
|
||||||
<option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
|
<option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
|
||||||
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
|
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
|
||||||
<option name="DEFAULT_PATCH_EXTENSION" value="patch" />
|
<option name="DEFAULT_PATCH_EXTENSION" value="patch" />
|
||||||
<option name="SHORT_DIFF_HORIZONTALLY" value="true" />
|
<option name="SHORT_DIFF_HORIZONTALLY" value="true" />
|
||||||
<option name="SHORT_DIFF_EXTRA_LINES" value="2" />
|
<option name="SHORT_DIFF_EXTRA_LINES" value="2" />
|
||||||
<option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
|
<option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
|
||||||
<option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
|
<option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
|
||||||
<option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
|
<option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
|
||||||
<option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
|
<option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
|
||||||
<option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
|
<option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
|
||||||
<option name="SHOW_DIRTY_RECURSIVELY" value="false" />
|
<option name="SHOW_DIRTY_RECURSIVELY" value="false" />
|
||||||
<option name="LIMIT_HISTORY" value="true" />
|
<option name="LIMIT_HISTORY" value="true" />
|
||||||
<option name="MAXIMUM_HISTORY_ROWS" value="1000" />
|
<option name="MAXIMUM_HISTORY_ROWS" value="1000" />
|
||||||
<option name="UPDATE_FILTER_SCOPE_NAME" />
|
<option name="UPDATE_FILTER_SCOPE_NAME" />
|
||||||
<option name="USE_COMMIT_MESSAGE_MARGIN" value="false" />
|
<option name="USE_COMMIT_MESSAGE_MARGIN" value="false" />
|
||||||
<option name="COMMIT_MESSAGE_MARGIN_SIZE" value="72" />
|
<option name="COMMIT_MESSAGE_MARGIN_SIZE" value="72" />
|
||||||
<option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
|
<option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
|
||||||
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
|
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
|
||||||
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
|
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" />
|
<option name="LAST_COMMIT_MESSAGE" />
|
||||||
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
|
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
|
||||||
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
|
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
|
||||||
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
|
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
|
||||||
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
|
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
|
||||||
<option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
|
<option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
|
||||||
<option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
|
<option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
|
||||||
<option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
|
<option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
|
||||||
<option name="ACTIVE_VCS_NAME" />
|
<option name="ACTIVE_VCS_NAME" />
|
||||||
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
|
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
|
||||||
<option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
|
<option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
|
||||||
<option name="UPDATE_FILTER_BY_SCOPE" value="false" />
|
<option name="UPDATE_FILTER_BY_SCOPE" value="false" />
|
||||||
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
|
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
|
||||||
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
|
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
|
||||||
</component>
|
</component>
|
||||||
<component name="XDebuggerManager">
|
<component name="XDebuggerManager">
|
||||||
<breakpoint-manager />
|
<breakpoint-manager />
|
||||||
</component>
|
</component>
|
||||||
<component name="antWorkspaceConfiguration">
|
<component name="antWorkspaceConfiguration">
|
||||||
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
||||||
<option name="FILTER_TARGETS" value="false" />
|
<option name="FILTER_TARGETS" value="false" />
|
||||||
</component>
|
</component>
|
||||||
<component name="editorHistoryManager">
|
<component name="editorHistoryManager">
|
||||||
<entry file="jar://C:/Program Files/Java/jdk1.7.0_45/src.zip!/java/util/regex/Matcher.java">
|
<entry file="jar://C:/Program Files/Java/jdk1.7.0_45/src.zip!/java/util/regex/Matcher.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="576" column="19" selection-start="20769" selection-end="20769" vertical-scroll-proportion="0.0">
|
<state line="576" column="19" selection-start="20769" selection-end="20769" vertical-scroll-proportion="0.0">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="jar://C:/Program Files/Java/jdk1.7.0_45/src.zip!/java/util/regex/Pattern.java">
|
<entry file="jar://C:/Program Files/Java/jdk1.7.0_45/src.zip!/java/util/regex/Pattern.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="4169" column="0" selection-start="152719" selection-end="152719" vertical-scroll-proportion="0.0">
|
<state line="4169" column="0" selection-start="152719" selection-end="152719" vertical-scroll-proportion="0.0">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/rusefi/NetListMergeUtil.java">
|
<entry file="file://$PROJECT_DIR$/src/rusefi/NetListMergeUtil.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="36" column="23" selection-start="1045" selection-end="1045" vertical-scroll-proportion="0.0">
|
<state line="36" column="23" selection-start="1045" selection-end="1045" vertical-scroll-proportion="0.0">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/rusefi/NetListMerge.java">
|
<entry file="file://$PROJECT_DIR$/src/rusefi/NetListMerge.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="50" column="79" selection-start="2052" selection-end="2052" vertical-scroll-proportion="0.52737224">
|
<state line="50" column="79" selection-start="2052" selection-end="2052" vertical-scroll-proportion="0.52737224">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,24 @@
|
||||||
<project default="jar">
|
<project default="jar">
|
||||||
|
|
||||||
<target name="clean">
|
<target name="clean">
|
||||||
<delete dir="build"/>
|
<delete dir="build"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="compile">
|
<target name="compile">
|
||||||
<mkdir dir="build/classes"/>
|
<mkdir dir="build/classes"/>
|
||||||
<javac destdir="build/classes" classpath="lib/junit.jar:lib/annotations.jar">
|
<javac destdir="build/classes" classpath="lib/junit.jar:lib/annotations.jar">
|
||||||
<src path="src"/>
|
<src path="src"/>
|
||||||
</javac>
|
</javac>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="jar" depends="compile">
|
<target name="jar" depends="compile">
|
||||||
<mkdir dir="build/jar"/>
|
<mkdir dir="build/jar"/>
|
||||||
<jar destfile="../net_list_merge.jar" basedir="build/classes">
|
<jar destfile="../net_list_merge.jar" basedir="build/classes">
|
||||||
<manifest>
|
<manifest>
|
||||||
<attribute name="Main-Class" value="rusefi.NetListMerge"/>
|
<attribute name="Main-Class" value="rusefi.NetListMerge"/>
|
||||||
</manifest>
|
</manifest>
|
||||||
<zipfileset dir="build/classes" includes="**/*.class"/>
|
<zipfileset dir="build/classes" includes="**/*.class"/>
|
||||||
</jar>
|
</jar>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module type="JAVA_MODULE" version="4">
|
<module type="JAVA_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,123 +1,123 @@
|
||||||
package rusefi;
|
package rusefi;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
import static rusefi.NetListMergeUtil.validateSection;
|
import static rusefi.NetListMergeUtil.validateSection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 12/8/13
|
* 12/8/13
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
*/
|
*/
|
||||||
public class NetListMerge {
|
public class NetListMerge {
|
||||||
private static final Pattern GET_HEADER = Pattern.compile("(.*)\\(components(.*)\\s*$", Pattern.DOTALL);
|
private static final Pattern GET_HEADER = Pattern.compile("(.*)\\(components(.*)\\s*$", Pattern.DOTALL);
|
||||||
|
|
||||||
private static final Pattern GET_COMPONENTS = Pattern.compile("(.*)\\)\\s*\\(libparts(.*)\\)\\)\\s*$", Pattern.DOTALL);
|
private static final Pattern GET_COMPONENTS = Pattern.compile("(.*)\\)\\s*\\(libparts(.*)\\)\\)\\s*$", Pattern.DOTALL);
|
||||||
|
|
||||||
private static final Pattern GET_LIBRARTS = Pattern.compile("(.*)\\)\\s*\\(libraries(.*)", Pattern.DOTALL);
|
private static final Pattern GET_LIBRARTS = Pattern.compile("(.*)\\)\\s*\\(libraries(.*)", Pattern.DOTALL);
|
||||||
private static final Pattern GET_LIBRARIES = Pattern.compile("(.*)\\)\\s*\\(nets(.*)", Pattern.DOTALL);
|
private static final Pattern GET_LIBRARIES = Pattern.compile("(.*)\\)\\s*\\(nets(.*)", Pattern.DOTALL);
|
||||||
|
|
||||||
|
|
||||||
private NetListMerge() {
|
private NetListMerge() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) throws IOException {
|
public static void main(String[] args) throws IOException {
|
||||||
if (args.length < 2) {
|
if (args.length < 2) {
|
||||||
System.out.println("This tool takes 'components' sections of multiple KiCad .net files and merges them into one");
|
System.out.println("This tool takes 'components' sections of multiple KiCad .net files and merges them into one");
|
||||||
System.out.println("usage:");
|
System.out.println("usage:");
|
||||||
System.out.println("NetListMerge DEST_FILE SOURCE_1 SOURCE_2 [SOURCE_x]*");
|
System.out.println("NetListMerge DEST_FILE SOURCE_1 SOURCE_2 [SOURCE_x]*");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
String destinationFile = args[0];
|
String destinationFile = args[0];
|
||||||
NetContent destination = parse(NetListMergeUtil.readFile(destinationFile));
|
NetContent destination = parse(NetListMergeUtil.readFile(destinationFile));
|
||||||
|
|
||||||
StringBuilder components = new StringBuilder();
|
StringBuilder components = new StringBuilder();
|
||||||
StringBuilder libparts = new StringBuilder();
|
StringBuilder libparts = new StringBuilder();
|
||||||
StringBuilder libraries = new StringBuilder();
|
StringBuilder libraries = new StringBuilder();
|
||||||
StringBuilder nets = new StringBuilder();
|
StringBuilder nets = new StringBuilder();
|
||||||
for (int i = 1; i < args.length; i++) {
|
for (int i = 1; i < args.length; i++) {
|
||||||
String sourceFile = args[i];
|
String sourceFile = args[i];
|
||||||
NetContent source = parse(NetListMergeUtil.readFile(sourceFile));
|
NetContent source = parse(NetListMergeUtil.readFile(sourceFile));
|
||||||
components.append(source.components);
|
components.append(source.components);
|
||||||
libparts.append(source.libparts);
|
libparts.append(source.libparts);
|
||||||
libraries.append(source.libraries);
|
libraries.append(source.libraries);
|
||||||
nets.append(source.nets);
|
nets.append(source.nets);
|
||||||
}
|
}
|
||||||
|
|
||||||
System.out.println("Total " + components.length() + " bytes of components");
|
System.out.println("Total " + components.length() + " bytes of components");
|
||||||
System.out.println("Total " + libparts.length() + " bytes of libparts");
|
System.out.println("Total " + libparts.length() + " bytes of libparts");
|
||||||
System.out.println("Total " + libraries.length() + " bytes of libraries");
|
System.out.println("Total " + libraries.length() + " bytes of libraries");
|
||||||
System.out.println("Total " + nets.length() + " bytes of nets");
|
System.out.println("Total " + nets.length() + " bytes of nets");
|
||||||
|
|
||||||
StringBuilder result = new StringBuilder(destination.header);
|
StringBuilder result = new StringBuilder(destination.header);
|
||||||
result.append(" (components").append(components).append(")\r\n");
|
result.append(" (components").append(components).append(")\r\n");
|
||||||
result.append(" (libparts").append(libparts).append(")\n");
|
result.append(" (libparts").append(libparts).append(")\n");
|
||||||
result.append(" (libraries").append(libraries).append(")\n");
|
result.append(" (libraries").append(libraries).append(")\n");
|
||||||
result.append(" (nets").append(nets).append(")");
|
result.append(" (nets").append(nets).append(")");
|
||||||
result.append(")");
|
result.append(")");
|
||||||
validateSection(result.toString());
|
validateSection(result.toString());
|
||||||
NetListMergeUtil.writeResult(result.toString(), "out.txt");
|
NetListMergeUtil.writeResult(result.toString(), "out.txt");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class NetContent {
|
private static class NetContent {
|
||||||
private final String header;
|
private final String header;
|
||||||
private final String components;
|
private final String components;
|
||||||
private final String libparts;
|
private final String libparts;
|
||||||
private final String nets;
|
private final String nets;
|
||||||
private final String libraries;
|
private final String libraries;
|
||||||
|
|
||||||
private NetContent(String header, String components, String libparts, String libraries, String nets) {
|
private NetContent(String header, String components, String libparts, String libraries, String nets) {
|
||||||
this.header = header;
|
this.header = header;
|
||||||
this.components = components;
|
this.components = components;
|
||||||
this.libparts = libparts;
|
this.libparts = libparts;
|
||||||
this.nets = nets;
|
this.nets = nets;
|
||||||
this.libraries = libraries;
|
this.libraries = libraries;
|
||||||
System.out.println("Got " + components.length() + " bytes of components");
|
System.out.println("Got " + components.length() + " bytes of components");
|
||||||
System.out.println("Got " + libparts.length() + " bytes of libparts");
|
System.out.println("Got " + libparts.length() + " bytes of libparts");
|
||||||
System.out.println("Got " + libraries.length() + " bytes of libraries");
|
System.out.println("Got " + libraries.length() + " bytes of libraries");
|
||||||
System.out.println("Got " + nets.length() + " bytes of nets");
|
System.out.println("Got " + nets.length() + " bytes of nets");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static NetContent parse(String content) {
|
private static NetContent parse(String content) {
|
||||||
Matcher headerMatcher = GET_HEADER.matcher(content);
|
Matcher headerMatcher = GET_HEADER.matcher(content);
|
||||||
headerMatcher.find();
|
headerMatcher.find();
|
||||||
if (!headerMatcher.matches())
|
if (!headerMatcher.matches())
|
||||||
throw new IllegalStateException("Does not match expected patten for header");
|
throw new IllegalStateException("Does not match expected patten for header");
|
||||||
|
|
||||||
String header = headerMatcher.group(1);
|
String header = headerMatcher.group(1);
|
||||||
String nonHeader = headerMatcher.group(2);
|
String nonHeader = headerMatcher.group(2);
|
||||||
|
|
||||||
Matcher componentsMatcher = GET_COMPONENTS.matcher(nonHeader);
|
Matcher componentsMatcher = GET_COMPONENTS.matcher(nonHeader);
|
||||||
if (!componentsMatcher.matches())
|
if (!componentsMatcher.matches())
|
||||||
throw new IllegalStateException("Does not match expected patten for components");
|
throw new IllegalStateException("Does not match expected patten for components");
|
||||||
|
|
||||||
String components = componentsMatcher.group(1);
|
String components = componentsMatcher.group(1);
|
||||||
String nonComponents = componentsMatcher.group(2);
|
String nonComponents = componentsMatcher.group(2);
|
||||||
validateSection(components);
|
validateSection(components);
|
||||||
|
|
||||||
Matcher libpartsMatcher = GET_LIBRARTS.matcher(nonComponents);
|
Matcher libpartsMatcher = GET_LIBRARTS.matcher(nonComponents);
|
||||||
if (!libpartsMatcher.matches())
|
if (!libpartsMatcher.matches())
|
||||||
throw new IllegalStateException("Does not match expected patten for libparts");
|
throw new IllegalStateException("Does not match expected patten for libparts");
|
||||||
|
|
||||||
String libparts = libpartsMatcher.group(1);
|
String libparts = libpartsMatcher.group(1);
|
||||||
String nonlibparts = libpartsMatcher.group(2);
|
String nonlibparts = libpartsMatcher.group(2);
|
||||||
validateSection(libparts);
|
validateSection(libparts);
|
||||||
|
|
||||||
Matcher librariesMatcher = GET_LIBRARIES.matcher(nonlibparts);
|
Matcher librariesMatcher = GET_LIBRARIES.matcher(nonlibparts);
|
||||||
if (!librariesMatcher.matches())
|
if (!librariesMatcher.matches())
|
||||||
throw new IllegalStateException("Does not match expected patten for nets");
|
throw new IllegalStateException("Does not match expected patten for nets");
|
||||||
|
|
||||||
String libraries = librariesMatcher.group(1);
|
String libraries = librariesMatcher.group(1);
|
||||||
String nets = librariesMatcher.group(2);
|
String nets = librariesMatcher.group(2);
|
||||||
validateSection(libraries);
|
validateSection(libraries);
|
||||||
validateSection(nets);
|
validateSection(nets);
|
||||||
|
|
||||||
// System.out.println("components: " + components);
|
// System.out.println("components: " + components);
|
||||||
|
|
||||||
return new NetContent(header, components, libparts, libraries, nets);
|
return new NetContent(header, components, libparts, libraries, nets);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,51 +1,51 @@
|
||||||
package rusefi;
|
package rusefi;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 12/8/13
|
* 12/8/13
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
*/
|
*/
|
||||||
public class NetListMergeUtil {
|
public class NetListMergeUtil {
|
||||||
static void writeResult(String content, String fileName) throws IOException {
|
static void writeResult(String content, String fileName) throws IOException {
|
||||||
System.out.println("Writing result into " + fileName);
|
System.out.println("Writing result into " + fileName);
|
||||||
BufferedWriter bw = new BufferedWriter(new FileWriter(fileName));
|
BufferedWriter bw = new BufferedWriter(new FileWriter(fileName));
|
||||||
bw.write(content);
|
bw.write(content);
|
||||||
bw.close();
|
bw.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
static String readFile(String fileName) throws IOException {
|
static String readFile(String fileName) throws IOException {
|
||||||
checkExistence(fileName);
|
checkExistence(fileName);
|
||||||
|
|
||||||
System.out.println("Reading " + fileName);
|
System.out.println("Reading " + fileName);
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
String line;
|
String line;
|
||||||
BufferedReader br = new BufferedReader(new FileReader(fileName));
|
BufferedReader br = new BufferedReader(new FileReader(fileName));
|
||||||
|
|
||||||
while (((line = br.readLine()) != null))
|
while (((line = br.readLine()) != null))
|
||||||
sb.append(line).append("\r\n");
|
sb.append(line).append("\r\n");
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void checkExistence(String fileName) {
|
private static void checkExistence(String fileName) {
|
||||||
if (!new File(fileName).isFile()) {
|
if (!new File(fileName).isFile()) {
|
||||||
System.err.println("File not found: " + fileName);
|
System.err.println("File not found: " + fileName);
|
||||||
System.exit(-1);
|
System.exit(-1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void validateSection(String section) {
|
static void validateSection(String section) {
|
||||||
int counter = 0;
|
int counter = 0;
|
||||||
for (int i = 0; i < section.length(); i++) {
|
for (int i = 0; i < section.length(); i++) {
|
||||||
char c = section.charAt(i);
|
char c = section.charAt(i);
|
||||||
if (c == '(')
|
if (c == '(')
|
||||||
counter++;
|
counter++;
|
||||||
else if (c == ')')
|
else if (c == ')')
|
||||||
counter--;
|
counter--;
|
||||||
if (counter < 0)
|
if (counter < 0)
|
||||||
throw new IllegalStateException("Invalid section: " + section);
|
throw new IllegalStateException("Invalid section: " + section);
|
||||||
}
|
}
|
||||||
if (counter != 0)
|
if (counter != 0)
|
||||||
throw new IllegalStateException("Invalid section: " + section + " balance: " + counter);
|
throw new IllegalStateException("Invalid section: " + section + " balance: " + counter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="AntConfiguration">
|
<component name="AntConfiguration">
|
||||||
<buildFile url="file://$PROJECT_DIR$/build.xml" />
|
<buildFile url="file://$PROJECT_DIR$/build.xml" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,23 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="CompilerConfiguration">
|
<component name="CompilerConfiguration">
|
||||||
<option name="DEFAULT_COMPILER" value="Javac" />
|
<option name="DEFAULT_COMPILER" value="Javac" />
|
||||||
<resourceExtensions />
|
<resourceExtensions />
|
||||||
<wildcardResourcePatterns>
|
<wildcardResourcePatterns>
|
||||||
<entry name="!?*.java" />
|
<entry name="!?*.java" />
|
||||||
<entry name="!?*.form" />
|
<entry name="!?*.form" />
|
||||||
<entry name="!?*.class" />
|
<entry name="!?*.class" />
|
||||||
<entry name="!?*.groovy" />
|
<entry name="!?*.groovy" />
|
||||||
<entry name="!?*.scala" />
|
<entry name="!?*.scala" />
|
||||||
<entry name="!?*.flex" />
|
<entry name="!?*.flex" />
|
||||||
<entry name="!?*.kt" />
|
<entry name="!?*.kt" />
|
||||||
<entry name="!?*.clj" />
|
<entry name="!?*.clj" />
|
||||||
</wildcardResourcePatterns>
|
</wildcardResourcePatterns>
|
||||||
<annotationProcessing>
|
<annotationProcessing>
|
||||||
<profile default="true" name="Default" enabled="false">
|
<profile default="true" name="Default" enabled="false">
|
||||||
<processorPath useClasspath="true" />
|
<processorPath useClasspath="true" />
|
||||||
</profile>
|
</profile>
|
||||||
</annotationProcessing>
|
</annotationProcessing>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
<component name="CopyrightManager">
|
<component name="CopyrightManager">
|
||||||
<settings default="" />
|
<settings default="" />
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
|
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="junit">
|
<library name="junit">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="jar://$PROJECT_DIR$/lib/junit.jar!/" />
|
<root url="jar://$PROJECT_DIR$/lib/junit.jar!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="EntryPointsManager">
|
<component name="EntryPointsManager">
|
||||||
<entry_points version="2.0" />
|
<entry_points version="2.0" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.7 64b" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.7 64b" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/out" />
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
</component>
|
</component>
|
||||||
<component name="SvnBranchConfigurationManager">
|
<component name="SvnBranchConfigurationManager">
|
||||||
<option name="mySupportsUserInfoFilter" value="true" />
|
<option name="mySupportsUserInfoFilter" value="true" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ProjectModuleManager">
|
<component name="ProjectModuleManager">
|
||||||
<modules>
|
<modules>
|
||||||
<module fileurl="file://$PROJECT_DIR$/pcb_sync.iml" filepath="$PROJECT_DIR$/pcb_sync.iml" />
|
<module fileurl="file://$PROJECT_DIR$/pcb_sync.iml" filepath="$PROJECT_DIR$/pcb_sync.iml" />
|
||||||
</modules>
|
</modules>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,25 @@
|
||||||
<component name="ProjectRunConfigurationManager">
|
<component name="ProjectRunConfigurationManager">
|
||||||
<configuration default="false" name="BomBuilder" type="Application" factoryName="Application">
|
<configuration default="false" name="BomBuilder" type="Application" factoryName="Application">
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
||||||
<option name="MAIN_CLASS_NAME" value="com.rusefi.bom.BomBuilder" />
|
<option name="MAIN_CLASS_NAME" value="com.rusefi.bom.BomBuilder" />
|
||||||
<option name="VM_PARAMETERS" value="" />
|
<option name="VM_PARAMETERS" value="" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="in.cmp comp.csv out.csv" />
|
<option name="PROGRAM_PARAMETERS" value="in.cmp comp.csv out.csv" />
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<module name="pcb_sync" />
|
<module name="pcb_sync" />
|
||||||
<envs />
|
<envs />
|
||||||
<RunnerSettings RunnerId="Debug">
|
<RunnerSettings RunnerId="Debug">
|
||||||
<option name="DEBUG_PORT" value="" />
|
<option name="DEBUG_PORT" value="" />
|
||||||
<option name="TRANSPORT" value="0" />
|
<option name="TRANSPORT" value="0" />
|
||||||
<option name="LOCAL" value="true" />
|
<option name="LOCAL" value="true" />
|
||||||
</RunnerSettings>
|
</RunnerSettings>
|
||||||
<RunnerSettings RunnerId="Run" />
|
<RunnerSettings RunnerId="Run" />
|
||||||
<ConfigurationWrapper RunnerId="Debug" />
|
<ConfigurationWrapper RunnerId="Debug" />
|
||||||
<ConfigurationWrapper RunnerId="Run" />
|
<ConfigurationWrapper RunnerId="Run" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,25 +1,25 @@
|
||||||
<component name="ProjectRunConfigurationManager">
|
<component name="ProjectRunConfigurationManager">
|
||||||
<configuration default="false" name="Main move" type="Application" factoryName="Application">
|
<configuration default="false" name="Main move" type="Application" factoryName="Application">
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
||||||
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
||||||
<option name="VM_PARAMETERS" value="" />
|
<option name="VM_PARAMETERS" value="" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="pcb_move frankenso_foundation.kicad_pcb frankenso_foundation.kicad_pcb 0 25.4" />
|
<option name="PROGRAM_PARAMETERS" value="pcb_move frankenso_foundation.kicad_pcb frankenso_foundation.kicad_pcb 0 25.4" />
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<module name="pcb_sync" />
|
<module name="pcb_sync" />
|
||||||
<envs />
|
<envs />
|
||||||
<RunnerSettings RunnerId="Debug">
|
<RunnerSettings RunnerId="Debug">
|
||||||
<option name="DEBUG_PORT" value="" />
|
<option name="DEBUG_PORT" value="" />
|
||||||
<option name="TRANSPORT" value="0" />
|
<option name="TRANSPORT" value="0" />
|
||||||
<option name="LOCAL" value="true" />
|
<option name="LOCAL" value="true" />
|
||||||
</RunnerSettings>
|
</RunnerSettings>
|
||||||
<RunnerSettings RunnerId="Run" />
|
<RunnerSettings RunnerId="Run" />
|
||||||
<ConfigurationWrapper RunnerId="Debug" />
|
<ConfigurationWrapper RunnerId="Debug" />
|
||||||
<ConfigurationWrapper RunnerId="Run" />
|
<ConfigurationWrapper RunnerId="Run" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,25 +1,25 @@
|
||||||
<component name="ProjectRunConfigurationManager">
|
<component name="ProjectRunConfigurationManager">
|
||||||
<configuration default="false" name="Main pcb_merge" type="Application" factoryName="Application">
|
<configuration default="false" name="Main pcb_merge" type="Application" factoryName="Application">
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
||||||
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
||||||
<option name="VM_PARAMETERS" value="" />
|
<option name="VM_PARAMETERS" value="" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="pcb_merge test.kicad_pcb out.kicad_pcb changes.txt" />
|
<option name="PROGRAM_PARAMETERS" value="pcb_merge test.kicad_pcb out.kicad_pcb changes.txt" />
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<module name="pcb_sync" />
|
<module name="pcb_sync" />
|
||||||
<envs />
|
<envs />
|
||||||
<RunnerSettings RunnerId="Debug">
|
<RunnerSettings RunnerId="Debug">
|
||||||
<option name="DEBUG_PORT" value="" />
|
<option name="DEBUG_PORT" value="" />
|
||||||
<option name="TRANSPORT" value="0" />
|
<option name="TRANSPORT" value="0" />
|
||||||
<option name="LOCAL" value="true" />
|
<option name="LOCAL" value="true" />
|
||||||
</RunnerSettings>
|
</RunnerSettings>
|
||||||
<RunnerSettings RunnerId="Run" />
|
<RunnerSettings RunnerId="Run" />
|
||||||
<ConfigurationWrapper RunnerId="Debug" />
|
<ConfigurationWrapper RunnerId="Debug" />
|
||||||
<ConfigurationWrapper RunnerId="Run" />
|
<ConfigurationWrapper RunnerId="Run" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,25 +1,25 @@
|
||||||
<component name="ProjectRunConfigurationManager">
|
<component name="ProjectRunConfigurationManager">
|
||||||
<configuration default="false" name="Main rename" type="Application" factoryName="Application">
|
<configuration default="false" name="Main rename" type="Application" factoryName="Application">
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
||||||
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
||||||
<option name="VM_PARAMETERS" value="" />
|
<option name="VM_PARAMETERS" value="" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="rename mmc_replace.txt in out" />
|
<option name="PROGRAM_PARAMETERS" value="rename mmc_replace.txt in out" />
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<module name="pcb_sync" />
|
<module name="pcb_sync" />
|
||||||
<envs />
|
<envs />
|
||||||
<RunnerSettings RunnerId="Debug">
|
<RunnerSettings RunnerId="Debug">
|
||||||
<option name="DEBUG_PORT" value="" />
|
<option name="DEBUG_PORT" value="" />
|
||||||
<option name="TRANSPORT" value="0" />
|
<option name="TRANSPORT" value="0" />
|
||||||
<option name="LOCAL" value="true" />
|
<option name="LOCAL" value="true" />
|
||||||
</RunnerSettings>
|
</RunnerSettings>
|
||||||
<RunnerSettings RunnerId="Run" />
|
<RunnerSettings RunnerId="Run" />
|
||||||
<ConfigurationWrapper RunnerId="Debug" />
|
<ConfigurationWrapper RunnerId="Debug" />
|
||||||
<ConfigurationWrapper RunnerId="Run" />
|
<ConfigurationWrapper RunnerId="Run" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,25 +1,25 @@
|
||||||
<component name="ProjectRunConfigurationManager">
|
<component name="ProjectRunConfigurationManager">
|
||||||
<configuration default="false" name="RemoveUnneededTraces" type="Application" factoryName="Application" nameIsGenerated="true">
|
<configuration default="false" name="RemoveUnneededTraces" type="Application" factoryName="Application" nameIsGenerated="true">
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
||||||
<option name="MAIN_CLASS_NAME" value="com.rusefi.misc.RemoveUnneededTraces" />
|
<option name="MAIN_CLASS_NAME" value="com.rusefi.misc.RemoveUnneededTraces" />
|
||||||
<option name="VM_PARAMETERS" value="" />
|
<option name="VM_PARAMETERS" value="" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="test.kicad_pcb test.kicad_pcb" />
|
<option name="PROGRAM_PARAMETERS" value="test.kicad_pcb test.kicad_pcb" />
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<module name="pcb_sync" />
|
<module name="pcb_sync" />
|
||||||
<envs />
|
<envs />
|
||||||
<RunnerSettings RunnerId="Debug">
|
<RunnerSettings RunnerId="Debug">
|
||||||
<option name="DEBUG_PORT" value="" />
|
<option name="DEBUG_PORT" value="" />
|
||||||
<option name="TRANSPORT" value="0" />
|
<option name="TRANSPORT" value="0" />
|
||||||
<option name="LOCAL" value="true" />
|
<option name="LOCAL" value="true" />
|
||||||
</RunnerSettings>
|
</RunnerSettings>
|
||||||
<RunnerSettings RunnerId="Run" />
|
<RunnerSettings RunnerId="Run" />
|
||||||
<ConfigurationWrapper RunnerId="Debug" />
|
<ConfigurationWrapper RunnerId="Debug" />
|
||||||
<ConfigurationWrapper RunnerId="Run" />
|
<ConfigurationWrapper RunnerId="Run" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,23 +1,23 @@
|
||||||
<component name="ProjectRunConfigurationManager">
|
<component name="ProjectRunConfigurationManager">
|
||||||
<configuration default="false" name="main cmp_merge" type="Application" factoryName="Application">
|
<configuration default="false" name="main cmp_merge" type="Application" factoryName="Application">
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
||||||
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
||||||
<option name="VM_PARAMETERS" value="" />
|
<option name="VM_PARAMETERS" value="" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="cmp_merge output\res.cmp 1.cmp 2.cmp" />
|
<option name="PROGRAM_PARAMETERS" value="cmp_merge output\res.cmp 1.cmp 2.cmp" />
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENV_VARIABLES" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<module name="pcb_sync" />
|
<module name="pcb_sync" />
|
||||||
<envs />
|
<envs />
|
||||||
<RunnerSettings RunnerId="Debug">
|
<RunnerSettings RunnerId="Debug">
|
||||||
<option name="DEBUG_PORT" value="" />
|
<option name="DEBUG_PORT" value="" />
|
||||||
<option name="TRANSPORT" value="0" />
|
<option name="TRANSPORT" value="0" />
|
||||||
<option name="LOCAL" value="true" />
|
<option name="LOCAL" value="true" />
|
||||||
</RunnerSettings>
|
</RunnerSettings>
|
||||||
<ConfigurationWrapper RunnerId="Debug" />
|
<ConfigurationWrapper RunnerId="Debug" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<component name="DependencyValidationManager">
|
<component name="DependencyValidationManager">
|
||||||
<state>
|
<state>
|
||||||
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
|
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
|
||||||
</state>
|
</state>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,125 +1,125 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="Palette2">
|
<component name="Palette2">
|
||||||
<group name="Swing">
|
<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">
|
<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" />
|
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
|
||||||
</item>
|
</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">
|
<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" />
|
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
|
<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" />
|
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="Button" />
|
<property name="text" value="Button" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="RadioButton" />
|
<property name="text" value="RadioButton" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="CheckBox" />
|
<property name="text" value="CheckBox" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
|
||||||
<initial-values>
|
<initial-values>
|
||||||
<property name="text" value="Label" />
|
<property name="text" value="Label" />
|
||||||
</initial-values>
|
</initial-values>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
<preferred-size width="150" height="-1" />
|
<preferred-size width="150" height="-1" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
<preferred-size width="150" height="-1" />
|
<preferred-size width="150" height="-1" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
<preferred-size width="150" height="-1" />
|
<preferred-size width="150" height="-1" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
<preferred-size width="150" height="50" />
|
<preferred-size width="150" height="50" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||||
<preferred-size width="200" height="200" />
|
<preferred-size width="200" height="200" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||||
<preferred-size width="200" height="200" />
|
<preferred-size width="200" height="200" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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">
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
|
||||||
<preferred-size width="-1" height="20" />
|
<preferred-size width="-1" height="20" />
|
||||||
</default-constraints>
|
</default-constraints>
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
|
||||||
</item>
|
</item>
|
||||||
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
<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" />
|
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
|
||||||
</item>
|
</item>
|
||||||
</group>
|
</group>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="VcsDirectoryMappings">
|
<component name="VcsDirectoryMappings">
|
||||||
<mapping directory="" vcs="svn" />
|
<mapping directory="" vcs="svn" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,48 +1,48 @@
|
||||||
P1;P401
|
P1;P401
|
||||||
P2;P402
|
P2;P402
|
||||||
P3;P403
|
P3;P403
|
||||||
P4;P404
|
P4;P404
|
||||||
P5;P405
|
P5;P405
|
||||||
P7;P406
|
P7;P406
|
||||||
|
|
||||||
R4;R401
|
R4;R401
|
||||||
R18;R402
|
R18;R402
|
||||||
|
|
||||||
R5;R403
|
R5;R403
|
||||||
R16;R404
|
R16;R404
|
||||||
|
|
||||||
R6;R405
|
R6;R405
|
||||||
R14;R406
|
R14;R406
|
||||||
|
|
||||||
R7;R407
|
R7;R407
|
||||||
R17;R408
|
R17;R408
|
||||||
|
|
||||||
R8;R409
|
R8;R409
|
||||||
R15;R410
|
R15;R410
|
||||||
|
|
||||||
R9;R411
|
R9;R411
|
||||||
R13;R412
|
R13;R412
|
||||||
|
|
||||||
|
|
||||||
R1;R451
|
R1;R451
|
||||||
R2;R452
|
R2;R452
|
||||||
R3;R453
|
R3;R453
|
||||||
|
|
||||||
|
|
||||||
Q1;Q401
|
Q1;Q401
|
||||||
Q2;Q402
|
Q2;Q402
|
||||||
Q3;Q403
|
Q3;Q403
|
||||||
Q4;Q404
|
Q4;Q404
|
||||||
Q5;Q405
|
Q5;Q405
|
||||||
Q6;Q406
|
Q6;Q406
|
||||||
|
|
||||||
|
|
||||||
D1;D401
|
D1;D401
|
||||||
D2;D402
|
D2;D402
|
||||||
D3;D403
|
D3;D403
|
||||||
D4;D404
|
D4;D404
|
||||||
D5;D405
|
D5;D405
|
||||||
D6;D406
|
D6;D406
|
||||||
D7;D407
|
D7;D407
|
||||||
D8;D408
|
D8;D408
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,24 +1,24 @@
|
||||||
<project default="jar">
|
<project default="jar">
|
||||||
|
|
||||||
<target name="clean">
|
<target name="clean">
|
||||||
<delete dir="build"/>
|
<delete dir="build"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="compile">
|
<target name="compile">
|
||||||
<mkdir dir="build/classes"/>
|
<mkdir dir="build/classes"/>
|
||||||
<javac destdir="build/classes" classpath="lib/junit.jar:lib/annotations.jar">
|
<javac destdir="build/classes" classpath="lib/junit.jar:lib/annotations.jar">
|
||||||
<src path="src"/>
|
<src path="src"/>
|
||||||
</javac>
|
</javac>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="jar" depends="compile">
|
<target name="jar" depends="compile">
|
||||||
<mkdir dir="build/jar"/>
|
<mkdir dir="build/jar"/>
|
||||||
<jar destfile="../pcb_sync.jar" basedir="build/classes">
|
<jar destfile="../pcb_sync.jar" basedir="build/classes">
|
||||||
<manifest>
|
<manifest>
|
||||||
<attribute name="Main-Class" value="com.rusefi.Main"/>
|
<attribute name="Main-Class" value="com.rusefi.Main"/>
|
||||||
</manifest>
|
</manifest>
|
||||||
<zipfileset dir="build/classes" includes="**/*.class"/>
|
<zipfileset dir="build/classes" includes="**/*.class"/>
|
||||||
</jar>
|
</jar>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
# move_module P353 -50 0
|
# move_module P353 -50 0
|
||||||
|
|
||||||
add adc_amp_divider.kicad_pcb
|
add adc_amp_divider.kicad_pcb
|
||||||
|
|
||||||
remove P_VOID1
|
remove P_VOID1
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#comment
|
#comment
|
||||||
|
|
||||||
SM0805_500K,resistor,resistto_part,hi resistor
|
SM0805_500K,resistor,resistto_part,hi resistor
|
||||||
|
|
||||||
LOGO_LOGO,ignore,ignore,ignore
|
LOGO_LOGO,ignore,ignore,ignore
|
||||||
|
|
|
@ -1,41 +1,41 @@
|
||||||
C5;C101
|
C5;C101
|
||||||
C6;C102
|
C6;C102
|
||||||
C10;C103
|
C10;C103
|
||||||
C13;C104
|
C13;C104
|
||||||
C31;C105
|
C31;C105
|
||||||
C32;C106
|
C32;C106
|
||||||
C33;C107
|
C33;C107
|
||||||
C34;C108
|
C34;C108
|
||||||
|
|
||||||
D1;D101
|
D1;D101
|
||||||
D2;D102
|
D2;D102
|
||||||
|
|
||||||
G1;G101
|
G1;G101
|
||||||
|
|
||||||
P1;P101
|
P1;P101
|
||||||
P2;P102
|
P2;P102
|
||||||
P3;P103
|
P3;P103
|
||||||
P4;P104
|
P4;P104
|
||||||
|
|
||||||
R1;R101
|
R1;R101
|
||||||
R38;R102
|
R38;R102
|
||||||
R39;R103
|
R39;R103
|
||||||
R40;R104
|
R40;R104
|
||||||
R41;R105
|
R41;R105
|
||||||
R42;R106
|
R42;R106
|
||||||
R43;R107
|
R43;R107
|
||||||
R44;R108
|
R44;R108
|
||||||
R45;R109
|
R45;R109
|
||||||
R46;R110
|
R46;R110
|
||||||
R48;R111
|
R48;R111
|
||||||
R49;R112
|
R49;R112
|
||||||
R52;R113
|
R52;R113
|
||||||
R53;R114
|
R53;R114
|
||||||
R62;R115
|
R62;R115
|
||||||
R64;R116
|
R64;R116
|
||||||
R65;R117
|
R65;R117
|
||||||
R66;R118
|
R66;R118
|
||||||
|
|
||||||
|
|
||||||
U20;U101
|
U20;U101
|
||||||
U24;U102
|
U24;U102
|
||||||
|
|
@ -1,55 +1,55 @@
|
||||||
|
|
||||||
optimize ../can_board/can_brd_1.kicad_pcb can_brd_1.kicad_pcb
|
optimize ../can_board/can_brd_1.kicad_pcb can_brd_1.kicad_pcb
|
||||||
|
|
||||||
|
|
||||||
add ../adc_amp_divider.vertical12/adc_amp_divider.kicad_pcb
|
add ../adc_amp_divider.vertical12/adc_amp_divider.kicad_pcb
|
||||||
add ../usb_mmc_spi/mmc_usb_1.kicad_pcb
|
add ../usb_mmc_spi/mmc_usb_1.kicad_pcb
|
||||||
add ../knock_VR_Art_ELectro/cps_vrs_io_1.kicad_pcb
|
add ../knock_VR_Art_ELectro/cps_vrs_io_1.kicad_pcb
|
||||||
add can_brd_1.kicad_pcb
|
add can_brd_1.kicad_pcb
|
||||||
|
|
||||||
|
|
||||||
# DD from the VR board
|
# DD from the VR board
|
||||||
# knock in
|
# knock in
|
||||||
remove P101
|
remove P101
|
||||||
# amp chip
|
# amp chip
|
||||||
remove U102
|
remove U102
|
||||||
# data out
|
# data out
|
||||||
remove P103
|
remove P103
|
||||||
|
|
||||||
remove R115
|
remove R115
|
||||||
remove R116
|
remove R116
|
||||||
remove R117
|
remove R117
|
||||||
remove R118
|
remove R118
|
||||||
|
|
||||||
|
|
||||||
remove C105
|
remove C105
|
||||||
remove C106
|
remove C106
|
||||||
remove C107
|
remove C107
|
||||||
remove C108
|
remove C108
|
||||||
|
|
||||||
|
|
||||||
# VR board power LED
|
# VR board power LED
|
||||||
remove R101
|
remove R101
|
||||||
remove D102
|
remove D102
|
||||||
remove D101
|
remove D101
|
||||||
remove R105
|
remove R105
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# CAN module connector
|
# CAN module connector
|
||||||
remove P471
|
remove P471
|
||||||
# CAN module power LED
|
# CAN module power LED
|
||||||
remove R471
|
remove R471
|
||||||
remove D471
|
remove D471
|
||||||
|
|
||||||
# SD/TTL module 3.3v LED
|
# SD/TTL module 3.3v LED
|
||||||
remove R354
|
remove R354
|
||||||
remove D353
|
remove D353
|
||||||
|
|
||||||
# SD/TTL module 5v LED
|
# SD/TTL module 5v LED
|
||||||
remove R353
|
remove R353
|
||||||
remove D352
|
remove D352
|
||||||
|
|
||||||
# SD/TTL right 10x2
|
# SD/TTL right 10x2
|
||||||
remove P354
|
remove P354
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module type="JAVA_MODULE" version="4">
|
<module type="JAVA_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="library" name="junit" level="project" />
|
<orderEntry type="library" name="junit" level="project" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,61 +1,61 @@
|
||||||
package com.rusefi;
|
package com.rusefi;
|
||||||
|
|
||||||
import com.rusefi.bom.BomBuilder;
|
import com.rusefi.bom.BomBuilder;
|
||||||
import com.rusefi.misc.CmpMergeTool;
|
import com.rusefi.misc.CmpMergeTool;
|
||||||
import com.rusefi.misc.RemoveUnneededTraces;
|
import com.rusefi.misc.RemoveUnneededTraces;
|
||||||
import com.rusefi.pcb.PcbMergeTool;
|
import com.rusefi.pcb.PcbMergeTool;
|
||||||
import com.rusefi.pcb.PcbMoveTool;
|
import com.rusefi.pcb.PcbMoveTool;
|
||||||
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.TreeMap;
|
import java.util.TreeMap;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 12/16/13.
|
* 12/16/13.
|
||||||
*/
|
*/
|
||||||
public class Main {
|
public class Main {
|
||||||
private static final Map<String, Class> TOOLS = new TreeMap<String, Class>(String.CASE_INSENSITIVE_ORDER);
|
private static final Map<String, Class> TOOLS = new TreeMap<String, Class>(String.CASE_INSENSITIVE_ORDER);
|
||||||
|
|
||||||
static {
|
static {
|
||||||
registerTool("pcb_move", PcbMoveTool.class);
|
registerTool("pcb_move", PcbMoveTool.class);
|
||||||
registerTool("pcb_merge", PcbMergeTool.class);
|
registerTool("pcb_merge", PcbMergeTool.class);
|
||||||
|
|
||||||
registerTool("copy", PcbCopyTool.class);
|
registerTool("copy", PcbCopyTool.class);
|
||||||
|
|
||||||
registerTool("cmp_merge", CmpMergeTool.class);
|
registerTool("cmp_merge", CmpMergeTool.class);
|
||||||
registerTool("rename", RenameComponents.class);
|
registerTool("rename", RenameComponents.class);
|
||||||
|
|
||||||
registerTool("optimize", RemoveUnneededTraces.class);
|
registerTool("optimize", RemoveUnneededTraces.class);
|
||||||
|
|
||||||
registerTool("bom_builder", BomBuilder.class);
|
registerTool("bom_builder", BomBuilder.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void registerTool(String name, Class<?> clazz) {
|
private static void registerTool(String name, Class<?> clazz) {
|
||||||
TOOLS.put(name, clazz);
|
TOOLS.put(name, clazz);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
|
public static void main(String[] args) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
|
||||||
if (args.length < 1) {
|
if (args.length < 1) {
|
||||||
System.out.println("At least tool name parameter expected");
|
System.out.println("At least tool name parameter expected");
|
||||||
System.out.println(TOOLS.size() + " tools available:");
|
System.out.println(TOOLS.size() + " tools available:");
|
||||||
for (String name : TOOLS.keySet())
|
for (String name : TOOLS.keySet())
|
||||||
System.out.println("\t\t" + name);
|
System.out.println("\t\t" + name);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
String name = args[0];
|
String name = args[0];
|
||||||
Class c = TOOLS.get(name);
|
Class c = TOOLS.get(name);
|
||||||
if (c == null)
|
if (c == null)
|
||||||
throw new NullPointerException("No tool: " + name);
|
throw new NullPointerException("No tool: " + name);
|
||||||
|
|
||||||
Method main = c.getMethod("main", String[].class);
|
Method main = c.getMethod("main", String[].class);
|
||||||
|
|
||||||
List<String> asList = Arrays.asList(args);
|
List<String> asList = Arrays.asList(args);
|
||||||
String[] a = asList.subList(1, asList.size()).toArray(new String[args.length - 1]);
|
String[] a = asList.subList(1, asList.size()).toArray(new String[args.length - 1]);
|
||||||
|
|
||||||
main.invoke(null, new Object[]{a});
|
main.invoke(null, new Object[]{a});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,36 +1,36 @@
|
||||||
package com.rusefi;
|
package com.rusefi;
|
||||||
|
|
||||||
import com.rusefi.misc.ChangesModel;
|
import com.rusefi.misc.ChangesModel;
|
||||||
import com.rusefi.pcb.PcbMergeTool;
|
import com.rusefi.pcb.PcbMergeTool;
|
||||||
import com.rusefi.pcb.PcbNode;
|
import com.rusefi.pcb.PcbNode;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Andrey Belomutskiy
|
* @author Andrey Belomutskiy
|
||||||
* 1/24/14
|
* 1/24/14
|
||||||
*/
|
*/
|
||||||
public class PcbCopyTool {
|
public class PcbCopyTool {
|
||||||
public static void main(String[] args) throws IOException {
|
public static void main(String[] args) throws IOException {
|
||||||
if (args.length != 2) {
|
if (args.length != 2) {
|
||||||
System.out.println("Two parameters expected: SOURCE DESTINATION");
|
System.out.println("Two parameters expected: SOURCE DESTINATION");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ChangesModel.readConfiguration("pcb_merge_changes.txt");
|
ChangesModel.readConfiguration("pcb_merge_changes.txt");
|
||||||
|
|
||||||
String input = args[0];
|
String input = args[0];
|
||||||
String output = args[1];
|
String output = args[1];
|
||||||
|
|
||||||
copy(input, output);
|
copy(input, output);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void copy(String input, String output) throws IOException {
|
public static void copy(String input, String output) throws IOException {
|
||||||
System.out.println("From " + input + " to " + output);
|
System.out.println("From " + input + " to " + output);
|
||||||
PcbNode node = PcbNode.readFromFile(input);
|
PcbNode node = PcbNode.readFromFile(input);
|
||||||
|
|
||||||
PcbMergeTool.removeNodes(node);
|
PcbMergeTool.removeNodes(node);
|
||||||
|
|
||||||
node.write(output);
|
node.write(output);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,106 +1,106 @@
|
||||||
package com.rusefi;
|
package com.rusefi;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
public class RenameComponents {
|
public class RenameComponents {
|
||||||
private static final Map<String, String> replaceMap = new HashMap<String, String>();
|
private static final Map<String, String> replaceMap = new HashMap<String, String>();
|
||||||
|
|
||||||
public static void main(String[] args) throws IOException {
|
public static void main(String[] args) throws IOException {
|
||||||
if (args.length != 3) {
|
if (args.length != 3) {
|
||||||
System.out.println("Three paramters expected:");
|
System.out.println("Three paramters expected:");
|
||||||
System.out.println(" replace_replace_file source_folder destination_folder");
|
System.out.println(" replace_replace_file source_folder destination_folder");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
String requestFileName = args[0];
|
String requestFileName = args[0];
|
||||||
File file = new File(requestFileName);
|
File file = new File(requestFileName);
|
||||||
if (!file.exists() || !file.isFile())
|
if (!file.exists() || !file.isFile())
|
||||||
throw new IllegalArgumentException("No replace_request_file");
|
throw new IllegalArgumentException("No replace_request_file");
|
||||||
String sourceDir = args[1];
|
String sourceDir = args[1];
|
||||||
assertFolder(sourceDir);
|
assertFolder(sourceDir);
|
||||||
String destinationDir = args[2];
|
String destinationDir = args[2];
|
||||||
assertFolder(destinationDir);
|
assertFolder(destinationDir);
|
||||||
|
|
||||||
readReplaceRequest(file);
|
readReplaceRequest(file);
|
||||||
for (String fileName : new File(sourceDir).list())
|
for (String fileName : new File(sourceDir).list())
|
||||||
processFile(sourceDir, destinationDir, fileName);
|
processFile(sourceDir, destinationDir, fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void processFile(String sourceDir, String destinationDir, String fileName) throws IOException {
|
private static void processFile(String sourceDir, String destinationDir, String fileName) throws IOException {
|
||||||
String newFileName = destinationDir + File.separator + fileName;
|
String newFileName = destinationDir + File.separator + fileName;
|
||||||
BufferedWriter bw = new BufferedWriter(new FileWriter(newFileName));
|
BufferedWriter bw = new BufferedWriter(new FileWriter(newFileName));
|
||||||
|
|
||||||
String sourceFile = sourceDir + File.separator + fileName;
|
String sourceFile = sourceDir + File.separator + fileName;
|
||||||
BufferedReader br = new BufferedReader(new FileReader(sourceFile));
|
BufferedReader br = new BufferedReader(new FileReader(sourceFile));
|
||||||
|
|
||||||
System.out.println("Making " + newFileName + " from " + sourceFile);
|
System.out.println("Making " + newFileName + " from " + sourceFile);
|
||||||
|
|
||||||
String line;
|
String line;
|
||||||
while ((line = br.readLine()) != null) {
|
while ((line = br.readLine()) != null) {
|
||||||
line = processLine(line);
|
line = processLine(line);
|
||||||
bw.append(line + "\r\n");
|
bw.append(line + "\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
bw.close();
|
bw.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String processLine(String line) {
|
private static String processLine(String line) {
|
||||||
for (Map.Entry<String, String> e : replaceMap.entrySet()) {
|
for (Map.Entry<String, String> e : replaceMap.entrySet()) {
|
||||||
String from = e.getKey();
|
String from = e.getKey();
|
||||||
String to = e.getValue();
|
String to = e.getValue();
|
||||||
|
|
||||||
line = Pattern.compile(" " + from + "$").matcher(
|
line = Pattern.compile(" " + from + "$").matcher(
|
||||||
line).replaceAll(Matcher.quoteReplacement(" " + to));
|
line).replaceAll(Matcher.quoteReplacement(" " + to));
|
||||||
|
|
||||||
line = processLine(line, " " + from + ";", " " + to + ";");
|
line = processLine(line, " " + from + ";", " " + to + ";");
|
||||||
line = processLine(line, " " + from + ")", " " + to + ")");
|
line = processLine(line, " " + from + ")", " " + to + ")");
|
||||||
line = processLine(line, " " + from + " ", " " + to + " ");
|
line = processLine(line, " " + from + " ", " " + to + " ");
|
||||||
line = processLine(line, " " + from + "-", " " + to + "-");
|
line = processLine(line, " " + from + "-", " " + to + "-");
|
||||||
line = processLine(line, "\"" + from + "\"", "\"" + to + "\"");
|
line = processLine(line, "\"" + from + "\"", "\"" + to + "\"");
|
||||||
}
|
}
|
||||||
return line;
|
return line;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String processLine(String line, String s, String s1) {
|
private static String processLine(String line, String s, String s1) {
|
||||||
return line.replace(s, s1);
|
return line.replace(s, s1);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void readReplaceRequest(File file) throws IOException {
|
private static void readReplaceRequest(File file) throws IOException {
|
||||||
String line;
|
String line;
|
||||||
BufferedReader br = new BufferedReader(new FileReader(file));
|
BufferedReader br = new BufferedReader(new FileReader(file));
|
||||||
int lineNumber = 0;
|
int lineNumber = 0;
|
||||||
|
|
||||||
while ((line = br.readLine()) != null) {
|
while ((line = br.readLine()) != null) {
|
||||||
lineNumber++;
|
lineNumber++;
|
||||||
line = line.trim();
|
line = line.trim();
|
||||||
if (line.isEmpty())
|
if (line.isEmpty())
|
||||||
continue;
|
continue;
|
||||||
String[] s = line.split("\\;");
|
String[] s = line.split("\\;");
|
||||||
if (s.length != 2)
|
if (s.length != 2)
|
||||||
throw new IllegalArgumentException("Invalid replace request: " + line);
|
throw new IllegalArgumentException("Invalid replace request: " + line);
|
||||||
|
|
||||||
String from = s[0];
|
String from = s[0];
|
||||||
String to = s[1];
|
String to = s[1];
|
||||||
|
|
||||||
|
|
||||||
if (replaceMap.containsKey(from) || replaceMap.containsValue(from))
|
if (replaceMap.containsKey(from) || replaceMap.containsValue(from))
|
||||||
throw new IllegalArgumentException("Name already mentioned: " + from + " @" + lineNumber);
|
throw new IllegalArgumentException("Name already mentioned: " + from + " @" + lineNumber);
|
||||||
|
|
||||||
if (replaceMap.containsKey(to) || replaceMap.containsValue(to))
|
if (replaceMap.containsKey(to) || replaceMap.containsValue(to))
|
||||||
throw new IllegalArgumentException("Name already mentioned: " + to + " @" + lineNumber);
|
throw new IllegalArgumentException("Name already mentioned: " + to + " @" + lineNumber);
|
||||||
|
|
||||||
replaceMap.put(from, to);
|
replaceMap.put(from, to);
|
||||||
|
|
||||||
System.out.println("Replacing [" + from + "] by [" + to + "]");
|
System.out.println("Replacing [" + from + "] by [" + to + "]");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void assertFolder(String dir) {
|
private static void assertFolder(String dir) {
|
||||||
File d = new File(dir);
|
File d = new File(dir);
|
||||||
if (!d.exists() || !d.isDirectory())
|
if (!d.exists() || !d.isDirectory())
|
||||||
throw new IllegalArgumentException("No such folder: " + dir);
|
throw new IllegalArgumentException("No such folder: " + dir);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,230 +1,230 @@
|
||||||
package com.rusefi.bom;
|
package com.rusefi.bom;
|
||||||
|
|
||||||
import com.rusefi.pcb.ModuleNode;
|
import com.rusefi.pcb.ModuleNode;
|
||||||
import com.rusefi.pcb.PcbNode;
|
import com.rusefi.pcb.PcbNode;
|
||||||
import com.rusefi.util.FileUtils;
|
import com.rusefi.util.FileUtils;
|
||||||
|
|
||||||
import java.io.BufferedWriter;
|
import java.io.BufferedWriter;
|
||||||
import java.io.FileWriter;
|
import java.io.FileWriter;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 2/2/14
|
* 2/2/14
|
||||||
*/
|
*/
|
||||||
public class BomBuilder {
|
public class BomBuilder {
|
||||||
private static final String DELIMITER = ",";
|
private static final String DELIMITER = ",";
|
||||||
|
|
||||||
private static final CpmFileModel allComponents = new CpmFileModel();
|
private static final CpmFileModel allComponents = new CpmFileModel();
|
||||||
private static final String IGNORE_TAG = "ignore";
|
private static final String IGNORE_TAG = "ignore";
|
||||||
private static String cmpFileName;
|
private static String cmpFileName;
|
||||||
private static String bomDictionaryName;
|
private static String bomDictionaryName;
|
||||||
private static Map<String, BomRecord> bomDictionary;
|
private static Map<String, BomRecord> bomDictionary;
|
||||||
private static Set<String> ignoreList = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
|
private static Set<String> ignoreList = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
|
||||||
|
|
||||||
private static boolean printQtyInFull = true;
|
private static boolean printQtyInFull = true;
|
||||||
private static boolean printPadCount = false;
|
private static boolean printPadCount = false;
|
||||||
private static boolean printReference = false;
|
private static boolean printReference = false;
|
||||||
private static boolean printUserComment = false;
|
private static boolean printUserComment = false;
|
||||||
private static PcbNode pcb;
|
private static PcbNode pcb;
|
||||||
|
|
||||||
public static void main(String[] args) throws IOException {
|
public static void main(String[] args) throws IOException {
|
||||||
if (args.length < 3) {
|
if (args.length < 3) {
|
||||||
System.out.println("bom_builder FILE_NAME.CMP PCB.kicad_pcb COMPONENTS_DICTIONARY.CSV OUTPUT_FILE.CSV");
|
System.out.println("bom_builder FILE_NAME.CMP PCB.kicad_pcb COMPONENTS_DICTIONARY.CSV OUTPUT_FILE.CSV");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
cmpFileName = args[0];
|
cmpFileName = args[0];
|
||||||
String pcbFileName = args[1];
|
String pcbFileName = args[1];
|
||||||
bomDictionaryName = args[2];
|
bomDictionaryName = args[2];
|
||||||
String outputFileName = args[3];
|
String outputFileName = args[3];
|
||||||
|
|
||||||
pcb = PcbNode.readFromFile(pcbFileName);
|
pcb = PcbNode.readFromFile(pcbFileName);
|
||||||
|
|
||||||
for (int i = 4; i < args.length; i++) {
|
for (int i = 4; i < args.length; i++) {
|
||||||
String option = args[i].trim();
|
String option = args[i].trim();
|
||||||
if (option.equalsIgnoreCase("printUserComment")) {
|
if (option.equalsIgnoreCase("printUserComment")) {
|
||||||
printUserComment = true;
|
printUserComment = true;
|
||||||
} else if (option.equalsIgnoreCase("printreference")) {
|
} else if (option.equalsIgnoreCase("printreference")) {
|
||||||
printReference = true;
|
printReference = true;
|
||||||
} else if (option.equalsIgnoreCase("printpadcount")) {
|
} else if (option.equalsIgnoreCase("printpadcount")) {
|
||||||
printPadCount = true;
|
printPadCount = true;
|
||||||
} else if (option.equalsIgnoreCase("skipqtyinfull")) {
|
} else if (option.equalsIgnoreCase("skipqtyinfull")) {
|
||||||
printQtyInFull = false;
|
printQtyInFull = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
allComponents.readCmpFile(FileUtils.readFileToList(cmpFileName));
|
allComponents.readCmpFile(FileUtils.readFileToList(cmpFileName));
|
||||||
|
|
||||||
bomDictionary = readBomDictionary(FileUtils.readFileToList(bomDictionaryName));
|
bomDictionary = readBomDictionary(FileUtils.readFileToList(bomDictionaryName));
|
||||||
|
|
||||||
writeCompactPartList(outputFileName + "_compact.csv", bomDictionary);
|
writeCompactPartList(outputFileName + "_compact.csv", bomDictionary);
|
||||||
writeFullPartList(outputFileName + "_full.csv", bomDictionary);
|
writeFullPartList(outputFileName + "_full.csv", bomDictionary);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void writeMissingElements(Map<String, BomRecord> bomDictionary, BufferedWriter bw, Map<String, List<BomComponent>> componentsByKey) throws IOException {
|
private static void writeMissingElements(Map<String, BomRecord> bomDictionary, BufferedWriter bw, Map<String, List<BomComponent>> componentsByKey) throws IOException {
|
||||||
for (Iterator<Map.Entry<String, List<BomComponent>>> i = componentsByKey.entrySet().iterator(); i.hasNext(); ) {
|
for (Iterator<Map.Entry<String, List<BomComponent>>> i = componentsByKey.entrySet().iterator(); i.hasNext(); ) {
|
||||||
Map.Entry<String, List<BomComponent>> e = i.next();
|
Map.Entry<String, List<BomComponent>> e = i.next();
|
||||||
String key = e.getKey();
|
String key = e.getKey();
|
||||||
|
|
||||||
if (ignoreList.contains(key))
|
if (ignoreList.contains(key))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
BomRecord bomRecord = bomDictionary.get(key);
|
BomRecord bomRecord = bomDictionary.get(key);
|
||||||
if (bomRecord == null) {
|
if (bomRecord == null) {
|
||||||
bw.write("### no BOM record for " + key + ": " + e.getValue() + "\r\n");
|
bw.write("### no BOM record for " + key + ": " + e.getValue() + "\r\n");
|
||||||
i.remove();
|
i.remove();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
bw.write("\r\n\n\n\n");
|
bw.write("\r\n\n\n\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void writeFullPartList(String outputFileName, Map<String, BomRecord> bomDictionary) throws IOException {
|
private static void writeFullPartList(String outputFileName, Map<String, BomRecord> bomDictionary) throws IOException {
|
||||||
BufferedWriter bw = new BufferedWriter(new FileWriter(outputFileName));
|
BufferedWriter bw = new BufferedWriter(new FileWriter(outputFileName));
|
||||||
|
|
||||||
Map<String, List<BomComponent>> componentsByKey = new TreeMap<String, List<BomComponent>>(allComponents.componentsByKey);
|
Map<String, List<BomComponent>> componentsByKey = new TreeMap<String, List<BomComponent>>(allComponents.componentsByKey);
|
||||||
|
|
||||||
log("Writing full parts list to " + outputFileName);
|
log("Writing full parts list to " + outputFileName);
|
||||||
writeCommonHeader(bw);
|
writeCommonHeader(bw);
|
||||||
writeMissingElements(bomDictionary, bw, componentsByKey);
|
writeMissingElements(bomDictionary, bw, componentsByKey);
|
||||||
|
|
||||||
StringBuilder notMounted = new StringBuilder();
|
StringBuilder notMounted = new StringBuilder();
|
||||||
|
|
||||||
for (Map.Entry<String, List<BomComponent>> e : componentsByKey.entrySet()) {
|
for (Map.Entry<String, List<BomComponent>> e : componentsByKey.entrySet()) {
|
||||||
// for instance, SM0805_47pF
|
// for instance, SM0805_47pF
|
||||||
String componentName = e.getKey();
|
String componentName = e.getKey();
|
||||||
|
|
||||||
List<BomComponent> list = e.getValue();
|
List<BomComponent> list = e.getValue();
|
||||||
|
|
||||||
if (ignoreList.contains(componentName))
|
if (ignoreList.contains(componentName))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
BomRecord bomRecord = bomDictionary.get(componentName);
|
BomRecord bomRecord = bomDictionary.get(componentName);
|
||||||
if (bomRecord == null)
|
if (bomRecord == null)
|
||||||
throw new NullPointerException();
|
throw new NullPointerException();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for (BomComponent c : list) {
|
for (BomComponent c : list) {
|
||||||
if (!findModule(c.getReference())) {
|
if (!findModule(c.getReference())) {
|
||||||
bw.write("Not mounted: " + c.getReference() + "\r\n");
|
bw.write("Not mounted: " + c.getReference() + "\r\n");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
writeLine(bw, bomRecord, 1, c.getReference() + ": ", c.getReference());
|
writeLine(bw, bomRecord, 1, c.getReference() + ": ", c.getReference());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
bw.close();
|
bw.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean findModule(String reference) {
|
private static boolean findModule(String reference) {
|
||||||
for (PcbNode node : pcb.iterate("module")) {
|
for (PcbNode node : pcb.iterate("module")) {
|
||||||
if (node instanceof ModuleNode) {
|
if (node instanceof ModuleNode) {
|
||||||
ModuleNode mn = (ModuleNode) node;
|
ModuleNode mn = (ModuleNode) node;
|
||||||
if (mn.getReference().equalsIgnoreCase(reference))
|
if (mn.getReference().equalsIgnoreCase(reference))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void writeCompactPartList(String outputFileName, Map<String, BomRecord> bomDictionary) throws IOException {
|
private static void writeCompactPartList(String outputFileName, Map<String, BomRecord> bomDictionary) throws IOException {
|
||||||
BufferedWriter bw = new BufferedWriter(new FileWriter(outputFileName));
|
BufferedWriter bw = new BufferedWriter(new FileWriter(outputFileName));
|
||||||
Map<String, List<BomComponent>> componentsByKey = new TreeMap<String, List<BomComponent>>(allComponents.componentsByKey);
|
Map<String, List<BomComponent>> componentsByKey = new TreeMap<String, List<BomComponent>>(allComponents.componentsByKey);
|
||||||
|
|
||||||
log("Writing compact parts list to " + outputFileName);
|
log("Writing compact parts list to " + outputFileName);
|
||||||
writeCommonHeader(bw);
|
writeCommonHeader(bw);
|
||||||
writeMissingElements(bomDictionary, bw, componentsByKey);
|
writeMissingElements(bomDictionary, bw, componentsByKey);
|
||||||
|
|
||||||
for (Map.Entry<String, List<BomComponent>> e : componentsByKey.entrySet()) {
|
for (Map.Entry<String, List<BomComponent>> e : componentsByKey.entrySet()) {
|
||||||
// for instance, SM0805_47pF
|
// for instance, SM0805_47pF
|
||||||
String componentName = e.getKey();
|
String componentName = e.getKey();
|
||||||
|
|
||||||
if (ignoreList.contains(componentName))
|
if (ignoreList.contains(componentName))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
List<BomComponent> list = e.getValue();
|
List<BomComponent> list = e.getValue();
|
||||||
log(list.size() + " items of " + componentName);
|
log(list.size() + " items of " + componentName);
|
||||||
|
|
||||||
BomRecord bomRecord = bomDictionary.get(componentName);
|
BomRecord bomRecord = bomDictionary.get(componentName);
|
||||||
if (bomRecord == null)
|
if (bomRecord == null)
|
||||||
throw new NullPointerException();
|
throw new NullPointerException();
|
||||||
writeLine(bw, bomRecord, list.size(), "", "");
|
writeLine(bw, bomRecord, list.size(), "", "");
|
||||||
}
|
}
|
||||||
bw.close();
|
bw.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void writeCommonHeader(BufferedWriter bw) throws IOException {
|
private static void writeCommonHeader(BufferedWriter bw) throws IOException {
|
||||||
bw.write("### this file was generated by rusEfi bom_builder on " + new Date() + "\r\n");
|
bw.write("### this file was generated by rusEfi bom_builder on " + new Date() + "\r\n");
|
||||||
bw.write("### " + allComponents.componentsCount + " components in " + allComponents.linesCount + " lines of " + cmpFileName + "\r\n");
|
bw.write("### " + allComponents.componentsCount + " components in " + allComponents.linesCount + " lines of " + cmpFileName + "\r\n");
|
||||||
bw.write("### " + allComponents.componentsByKey.size() + " kinds of components in input file\r\n");
|
bw.write("### " + allComponents.componentsByKey.size() + " kinds of components in input file\r\n");
|
||||||
bw.write("### " + bomDictionary.size() + " entries in BOM dictionary " + bomDictionaryName + "\r\n");
|
bw.write("### " + bomDictionary.size() + " entries in BOM dictionary " + bomDictionaryName + "\r\n");
|
||||||
bw.write("### " + ignoreList.size() + " entries in ignore list\r\n");
|
bw.write("### " + ignoreList.size() + " entries in ignore list\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void writeLine(BufferedWriter bw, BomRecord bomRecord, int quantity, String prefix, String reference) throws IOException {
|
private static void writeLine(BufferedWriter bw, BomRecord bomRecord, int quantity, String prefix, String reference) throws IOException {
|
||||||
bw.write(quantity + DELIMITER +
|
bw.write(quantity + DELIMITER +
|
||||||
bomRecord.getStorePart() + DELIMITER +
|
bomRecord.getStorePart() + DELIMITER +
|
||||||
prefix + bomRecord.getCustomerRef() + DELIMITER +
|
prefix + bomRecord.getCustomerRef() + DELIMITER +
|
||||||
(printReference ? reference + DELIMITER : "") +
|
(printReference ? reference + DELIMITER : "") +
|
||||||
(printUserComment ? bomRecord.getUserComment() + DELIMITER : "") +
|
(printUserComment ? bomRecord.getUserComment() + DELIMITER : "") +
|
||||||
(printPadCount ? bomRecord.getPadCount() + DELIMITER : "") +
|
(printPadCount ? bomRecord.getPadCount() + DELIMITER : "") +
|
||||||
"\r\n"
|
"\r\n"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Map<String, BomRecord> readBomDictionary(List<String> strings) {
|
private static Map<String, BomRecord> readBomDictionary(List<String> strings) {
|
||||||
Map<String, BomRecord> result = new TreeMap<String, BomRecord>(String.CASE_INSENSITIVE_ORDER);
|
Map<String, BomRecord> result = new TreeMap<String, BomRecord>(String.CASE_INSENSITIVE_ORDER);
|
||||||
for (String line : strings) {
|
for (String line : strings) {
|
||||||
line = line.trim();
|
line = line.trim();
|
||||||
if (line.isEmpty())
|
if (line.isEmpty())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (line.startsWith("#")) {
|
if (line.startsWith("#")) {
|
||||||
log("Skipping comment: " + line);
|
log("Skipping comment: " + line);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
String[] tokens = line.split(",");
|
String[] tokens = line.split(",");
|
||||||
|
|
||||||
if (tokens.length < 2) {
|
if (tokens.length < 2) {
|
||||||
log("Unexpected line: " + line + " Expected at least two tokens but " + tokens.length);
|
log("Unexpected line: " + line + " Expected at least two tokens but " + tokens.length);
|
||||||
System.exit(-1);
|
System.exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
String ref = tokens[0];
|
String ref = tokens[0];
|
||||||
String mfgPart = tokens[1];
|
String mfgPart = tokens[1];
|
||||||
|
|
||||||
if (mfgPart.equalsIgnoreCase(IGNORE_TAG)) {
|
if (mfgPart.equalsIgnoreCase(IGNORE_TAG)) {
|
||||||
log("Ignoring entry: " + ref);
|
log("Ignoring entry: " + ref);
|
||||||
ignoreList.add(ref);
|
ignoreList.add(ref);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tokens.length != 6) {
|
if (tokens.length != 6) {
|
||||||
log("Unexpected line: [" + line + "] Expected 6 tokens but " + tokens.length);
|
log("Unexpected line: [" + line + "] Expected 6 tokens but " + tokens.length);
|
||||||
System.exit(-1);
|
System.exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
String storePart = tokens[2];
|
String storePart = tokens[2];
|
||||||
String componentName = tokens[3];
|
String componentName = tokens[3];
|
||||||
int padCount = Integer.parseInt(tokens[4]);
|
int padCount = Integer.parseInt(tokens[4]);
|
||||||
String customerRef = tokens[5];
|
String customerRef = tokens[5];
|
||||||
|
|
||||||
result.put(ref, new BomRecord(mfgPart, storePart, customerRef, padCount, componentName));
|
result.put(ref, new BomRecord(mfgPart, storePart, customerRef, padCount, componentName));
|
||||||
|
|
||||||
log("BOM key: " + ref);
|
log("BOM key: " + ref);
|
||||||
log("mfgPartNo: " + mfgPart);
|
log("mfgPartNo: " + mfgPart);
|
||||||
log("storePartNo: " + storePart);
|
log("storePartNo: " + storePart);
|
||||||
}
|
}
|
||||||
|
|
||||||
log("Got " + result.size() + " entries in BOM dictionary");
|
log("Got " + result.size() + " entries in BOM dictionary");
|
||||||
log("Got " + ignoreList.size() + " entries in ignore list");
|
log("Got " + ignoreList.size() + " entries in ignore list");
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static void log(String msg) {
|
protected static void log(String msg) {
|
||||||
System.out.println(msg);
|
System.out.println(msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,22 @@
|
||||||
package com.rusefi.bom;
|
package com.rusefi.bom;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 2/2/14
|
* 2/2/14
|
||||||
*/
|
*/
|
||||||
public class BomComponent {
|
public class BomComponent {
|
||||||
private final String reference;
|
private final String reference;
|
||||||
|
|
||||||
public BomComponent(String reference) {
|
public BomComponent(String reference) {
|
||||||
this.reference = reference;
|
this.reference = reference;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getReference() {
|
public String getReference() {
|
||||||
return reference;
|
return reference;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return reference;
|
return reference;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,41 +1,41 @@
|
||||||
package com.rusefi.bom;
|
package com.rusefi.bom;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 2/2/14
|
* 2/2/14
|
||||||
*/
|
*/
|
||||||
public class BomRecord {
|
public class BomRecord {
|
||||||
private final String mfgPart;
|
private final String mfgPart;
|
||||||
private final String storePart;
|
private final String storePart;
|
||||||
private final String customerRef;
|
private final String customerRef;
|
||||||
private final int padCount;
|
private final int padCount;
|
||||||
private final String userComment;
|
private final String userComment;
|
||||||
|
|
||||||
public BomRecord(String mfgPart, String storePart, String customerRef, int padCount, String userComment) {
|
public BomRecord(String mfgPart, String storePart, String customerRef, int padCount, String userComment) {
|
||||||
this.mfgPart = mfgPart;
|
this.mfgPart = mfgPart;
|
||||||
this.storePart = storePart;
|
this.storePart = storePart;
|
||||||
this.customerRef = customerRef;
|
this.customerRef = customerRef;
|
||||||
this.padCount = padCount;
|
this.padCount = padCount;
|
||||||
this.userComment = userComment;
|
this.userComment = userComment;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getMfgPart() {
|
public String getMfgPart() {
|
||||||
return mfgPart;
|
return mfgPart;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getStorePart() {
|
public String getStorePart() {
|
||||||
return storePart;
|
return storePart;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getCustomerRef() {
|
public String getCustomerRef() {
|
||||||
return customerRef;
|
return customerRef;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getPadCount() {
|
public int getPadCount() {
|
||||||
return padCount;
|
return padCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getUserComment() {
|
public String getUserComment() {
|
||||||
return userComment;
|
return userComment;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,75 +1,75 @@
|
||||||
package com.rusefi.bom;
|
package com.rusefi.bom;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.TreeMap;
|
import java.util.TreeMap;
|
||||||
|
|
||||||
import static com.rusefi.bom.BomBuilder.log;
|
import static com.rusefi.bom.BomBuilder.log;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 2/22/14
|
* 2/22/14
|
||||||
*/
|
*/
|
||||||
public class CpmFileModel {
|
public class CpmFileModel {
|
||||||
|
|
||||||
public final Map<String, List<BomComponent>> componentsByKey = new TreeMap<String, List<BomComponent>>(String.CASE_INSENSITIVE_ORDER);
|
public final Map<String, List<BomComponent>> componentsByKey = new TreeMap<String, List<BomComponent>>(String.CASE_INSENSITIVE_ORDER);
|
||||||
|
|
||||||
public int linesCount;
|
public int linesCount;
|
||||||
public int componentsCount;
|
public int componentsCount;
|
||||||
|
|
||||||
|
|
||||||
public void readCmpFile(List<String> list) throws IOException {
|
public void readCmpFile(List<String> list) throws IOException {
|
||||||
linesCount = list.size();
|
linesCount = list.size();
|
||||||
componentsCount = 0;
|
componentsCount = 0;
|
||||||
|
|
||||||
for (int lineIndex = 0; lineIndex < list.size(); lineIndex++) {
|
for (int lineIndex = 0; lineIndex < list.size(); lineIndex++) {
|
||||||
String line = list.get(lineIndex);
|
String line = list.get(lineIndex);
|
||||||
if ("BeginCmp".equals(line)) {
|
if ("BeginCmp".equals(line)) {
|
||||||
componentsCount++;
|
componentsCount++;
|
||||||
|
|
||||||
lineIndex += 2; // skipping 'TimeStamp' line
|
lineIndex += 2; // skipping 'TimeStamp' line
|
||||||
|
|
||||||
String a = list.get(lineIndex);
|
String a = list.get(lineIndex);
|
||||||
String reference = parseReferenceLine(a);
|
String reference = parseReferenceLine(a);
|
||||||
log(lineIndex + ": reference: " + reference);
|
log(lineIndex + ": reference: " + reference);
|
||||||
lineIndex++;
|
lineIndex++;
|
||||||
|
|
||||||
String valueLine = list.get(lineIndex);
|
String valueLine = list.get(lineIndex);
|
||||||
String value = parseValueLine(valueLine);
|
String value = parseValueLine(valueLine);
|
||||||
log(lineIndex + ": value: " + value);
|
log(lineIndex + ": value: " + value);
|
||||||
lineIndex++;
|
lineIndex++;
|
||||||
|
|
||||||
String packageLine = list.get(lineIndex);
|
String packageLine = list.get(lineIndex);
|
||||||
|
|
||||||
String packageName = packageLine.split("=")[1].trim();
|
String packageName = packageLine.split("=")[1].trim();
|
||||||
packageName = cutLastSymbol(packageName);
|
packageName = cutLastSymbol(packageName);
|
||||||
log(lineIndex + ": package: " + packageName);
|
log(lineIndex + ": package: " + packageName);
|
||||||
lineIndex++;
|
lineIndex++;
|
||||||
|
|
||||||
String package_value = packageName + "_" + value;
|
String package_value = packageName + "_" + value;
|
||||||
List<BomComponent> l = componentsByKey.get(package_value);
|
List<BomComponent> l = componentsByKey.get(package_value);
|
||||||
if (l == null) {
|
if (l == null) {
|
||||||
l = new ArrayList<BomComponent>();
|
l = new ArrayList<BomComponent>();
|
||||||
componentsByKey.put(package_value, l);
|
componentsByKey.put(package_value, l);
|
||||||
}
|
}
|
||||||
l.add(new BomComponent(reference));
|
l.add(new BomComponent(reference));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String parseValueLine(String s) {
|
private static String parseValueLine(String s) {
|
||||||
String value = s.split("=")[1].trim();
|
String value = s.split("=")[1].trim();
|
||||||
return cutLastSymbol(value);
|
return cutLastSymbol(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String parseReferenceLine(String line) {
|
private static String parseReferenceLine(String line) {
|
||||||
String reference = line.split("=")[1].trim();
|
String reference = line.split("=")[1].trim();
|
||||||
return cutLastSymbol(reference);
|
return cutLastSymbol(reference);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String cutLastSymbol(String reference) {
|
private static String cutLastSymbol(String reference) {
|
||||||
return reference.substring(0, reference.length() - 1);
|
return reference.substring(0, reference.length() - 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue