manual sync
This commit is contained in:
rusefi
parent
d3db6d706c
commit
a7a4027b6f
|
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -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,135 +1,160 @@
|
||||||
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 {
|
||||||
public static void main(String[] args) throws IOException {
|
private static final Pattern p2 = Pattern.compile(".*0x(\\S*)(.*)");
|
||||||
BufferedReader fr = new BufferedReader(new FileReader("rusefi.map"));
|
|
||||||
|
public static void main(String[] args) throws IOException {
|
||||||
String line;
|
BufferedReader fr = new BufferedReader(new FileReader("rusefi.map"));
|
||||||
List<String> lines = new ArrayList<String>();
|
|
||||||
|
String line;
|
||||||
while ((line = fr.readLine()) != null)
|
List<String> lines = new ArrayList<String>();
|
||||||
lines.add(line);
|
|
||||||
|
while ((line = fr.readLine()) != null)
|
||||||
debug("Got " + lines.size() + " lines");
|
lines.add(line);
|
||||||
|
|
||||||
List<Record> records = process(lines);
|
debug("Got " + lines.size() + " lines");
|
||||||
|
|
||||||
Collections.sort(records, new Comparator<Record>() {
|
List<Record> records = process(lines);
|
||||||
@Override
|
|
||||||
public int compare(Record o1, Record o2) {
|
Collections.sort(records, new Comparator<Record>() {
|
||||||
return o2.compareTo(o1);
|
@Override
|
||||||
}
|
public int compare(Record o1, Record o2) {
|
||||||
});
|
return o2.compareTo(o1);
|
||||||
|
}
|
||||||
int totalSize = 0;
|
});
|
||||||
for (Record record : records) {
|
|
||||||
System.out.println(record);
|
int totalSize = 0;
|
||||||
totalSize += record.size;
|
for (Record record : records) {
|
||||||
}
|
System.out.println(record);
|
||||||
|
totalSize += record.size;
|
||||||
System.out.println("Total size: " + totalSize);
|
}
|
||||||
}
|
|
||||||
|
System.out.println("Total size: " + totalSize);
|
||||||
private static List<Record> process(List<String> lines) {
|
}
|
||||||
Pattern p1 = Pattern.compile(".*\\.bss\\.(\\S*).*0x.*0x(\\S*)(.*)");
|
|
||||||
|
private static List<Record> process(List<String> lines) {
|
||||||
Pattern p2 = Pattern.compile(".*0x(\\S*)(.*)");
|
Pattern p1 = Pattern.compile(".*\\.bss\\.(\\S*).*0x.*0x(\\S*)(.*)");
|
||||||
|
|
||||||
List<Record> result = new ArrayList<Record>();
|
|
||||||
for (int i = 0; i < lines.size(); i++) {
|
List<Record> result = new ArrayList<Record>();
|
||||||
String line = lines.get(i);
|
for (int i = 0; i < lines.size(); i++) {
|
||||||
if (!line.contains(".bss."))
|
String line = lines.get(i);
|
||||||
continue;
|
if (!line.contains(".bss."))
|
||||||
debug(line);
|
continue;
|
||||||
|
debug(line);
|
||||||
Matcher m1 = p1.matcher(line);
|
|
||||||
|
Matcher m1 = p1.matcher(line);
|
||||||
if (m1.matches()) {
|
|
||||||
debug("Single-line " + line);
|
if (m1.matches()) {
|
||||||
|
parseSingleLine(result, line, m1, i);
|
||||||
String suffix = m1.group(1);
|
} else {
|
||||||
String sizeString = m1.group(2);
|
i = parseMultiLine(lines, result, i, line);
|
||||||
String prefix = m1.group(3);
|
}
|
||||||
|
}
|
||||||
String name = prefix + "@" + suffix;
|
return result;
|
||||||
|
}
|
||||||
int size = Integer.parseInt(sizeString, 16);
|
|
||||||
|
private static int parseMultiLine(List<String> lines, List<Record> result, int lineIndex, String line) {
|
||||||
debug("Name " + name);
|
debug("Multi-line " + line);
|
||||||
debug("size " + size);
|
String suffix = line;
|
||||||
|
line = lines.get(++lineIndex);
|
||||||
result.add(new Record(size, name));
|
|
||||||
} else {
|
Matcher m2 = p2.matcher(line);
|
||||||
debug("Multi-line " + line);
|
|
||||||
String suffix = line;
|
if (!m2.matches()) {
|
||||||
line = lines.get(++i);
|
debug("Skipping " + line);
|
||||||
|
return lineIndex;
|
||||||
Matcher m2 = p2.matcher(line);
|
}
|
||||||
|
|
||||||
if (!m2.matches()) {
|
String sizeString = m2.group(1);
|
||||||
debug("Skipping " + line);
|
String prefix = m2.group(2);
|
||||||
continue;
|
|
||||||
}
|
debug("Next line " + line);
|
||||||
|
|
||||||
String sizeString = m2.group(1);
|
String name = prefix + "@" + suffix;
|
||||||
String prefix = m2.group(2);
|
|
||||||
|
if (line.contains("ALIGN")) {
|
||||||
debug("Next line " + line);
|
System.out.println("TODO: better handle " + line);
|
||||||
|
return lineIndex;
|
||||||
String name = prefix + "@" + suffix;
|
}
|
||||||
|
|
||||||
int size = Integer.parseInt(sizeString, 16);
|
int size;
|
||||||
|
try {
|
||||||
debug("Name " + name);
|
size = Integer.parseInt(sizeString, 16);
|
||||||
debug("size " + size);
|
} catch (NumberFormatException e) {
|
||||||
|
throw new IllegalStateException("While parsing @ " + lineIndex);
|
||||||
result.add(new Record(size, name));
|
}
|
||||||
}
|
|
||||||
}
|
debug("Name " + name);
|
||||||
return result;
|
debug("size " + size);
|
||||||
}
|
|
||||||
|
result.add(new Record(size, name));
|
||||||
private static void debug(String s) {
|
return lineIndex;
|
||||||
// System.out.println(s);
|
}
|
||||||
}
|
|
||||||
|
private static void parseSingleLine(List<Record> result, String line, Matcher m1, int lineIndex) {
|
||||||
static class Record implements Comparable<Record> {
|
debug("Single-line " + line);
|
||||||
private final int size;
|
|
||||||
private final String name;
|
String suffix = m1.group(1);
|
||||||
|
String sizeString = m1.group(2);
|
||||||
public Record(int size, String name) {
|
String prefix = m1.group(3);
|
||||||
this.size = size;
|
|
||||||
this.name = name;
|
String name = prefix + "@" + suffix;
|
||||||
}
|
|
||||||
|
int size;
|
||||||
@Override
|
try {
|
||||||
public int compareTo(Record o) {
|
size = Integer.parseInt(sizeString, 16);
|
||||||
int d = size - o.size;
|
} catch (NumberFormatException e) {
|
||||||
if (d != 0)
|
throw new IllegalStateException("While parsing @ " + lineIndex);
|
||||||
return d;
|
}
|
||||||
return name.compareTo(o.name);
|
|
||||||
}
|
debug("Name " + name);
|
||||||
|
debug("size " + size);
|
||||||
@Override
|
|
||||||
public String toString() {
|
result.add(new Record(size, name));
|
||||||
return "Record{" +
|
}
|
||||||
"size=" + size +
|
|
||||||
", name='" + name + '\'' +
|
private static void debug(String s) {
|
||||||
'}';
|
// System.out.println(s);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
static class Record implements Comparable<Record> {
|
||||||
|
private final int size;
|
||||||
|
private final String name;
|
||||||
|
|
||||||
|
public Record(int size, String name) {
|
||||||
|
this.size = size;
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int compareTo(Record o) {
|
||||||
|
int d = size - o.size;
|
||||||
|
if (d != 0)
|
||||||
|
return d;
|
||||||
|
return name.compareTo(o.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "Record{" +
|
||||||
|
"size=" + size +
|
||||||
|
", 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -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,5 +1,3 @@
|
||||||
<component name="CopyrightManager">
|
<component name="CopyrightManager">
|
||||||
<settings default="">
|
<settings default="" />
|
||||||
<module2copyright />
|
|
||||||
</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,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_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" 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,24 +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">
|
||||||
<option name="MAIN_CLASS_NAME" value="com.rusefi.bom.BomBuilder" />
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
||||||
<option name="VM_PARAMETERS" value="" />
|
<option name="MAIN_CLASS_NAME" value="com.rusefi.bom.BomBuilder" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="in.cmp comp.csv out.csv" />
|
<option name="VM_PARAMETERS" value="" />
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
<option name="PROGRAM_PARAMETERS" value="in.cmp comp.csv out.csv" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="ENV_VARIABLES" />
|
||||||
<module name="pcb_sync" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<envs />
|
<module name="pcb_sync" />
|
||||||
<RunnerSettings RunnerId="Debug">
|
<envs />
|
||||||
<option name="DEBUG_PORT" value="" />
|
<RunnerSettings RunnerId="Debug">
|
||||||
<option name="TRANSPORT" value="0" />
|
<option name="DEBUG_PORT" value="" />
|
||||||
<option name="LOCAL" value="true" />
|
<option name="TRANSPORT" value="0" />
|
||||||
</RunnerSettings>
|
<option name="LOCAL" value="true" />
|
||||||
<RunnerSettings RunnerId="Run" />
|
</RunnerSettings>
|
||||||
<ConfigurationWrapper RunnerId="Debug" />
|
<RunnerSettings RunnerId="Run" />
|
||||||
<ConfigurationWrapper RunnerId="Run" />
|
<ConfigurationWrapper RunnerId="Debug" />
|
||||||
<method />
|
<ConfigurationWrapper RunnerId="Run" />
|
||||||
</configuration>
|
<method />
|
||||||
|
</configuration>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,22 +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">
|
||||||
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
||||||
<option name="VM_PARAMETERS" value="" />
|
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="pcb_move can_brd_1.kicad_pcb -43.18 58.928" />
|
<option name="VM_PARAMETERS" value="" />
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
<option name="PROGRAM_PARAMETERS" value="pcb_move frankenso_foundation.kicad_pcb frankenso_foundation.kicad_pcb 0 25.4" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="ENV_VARIABLES" />
|
||||||
<module name="pcb_sync" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<envs />
|
<module name="pcb_sync" />
|
||||||
<RunnerSettings RunnerId="Debug">
|
<envs />
|
||||||
<option name="DEBUG_PORT" value="" />
|
<RunnerSettings RunnerId="Debug">
|
||||||
<option name="TRANSPORT" value="0" />
|
<option name="DEBUG_PORT" value="" />
|
||||||
<option name="LOCAL" value="true" />
|
<option name="TRANSPORT" value="0" />
|
||||||
</RunnerSettings>
|
<option name="LOCAL" value="true" />
|
||||||
<ConfigurationWrapper RunnerId="Debug" />
|
</RunnerSettings>
|
||||||
<method />
|
<RunnerSettings RunnerId="Run" />
|
||||||
</configuration>
|
<ConfigurationWrapper RunnerId="Debug" />
|
||||||
|
<ConfigurationWrapper RunnerId="Run" />
|
||||||
|
<method />
|
||||||
|
</configuration>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,24 +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">
|
||||||
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
||||||
<option name="VM_PARAMETERS" value="" />
|
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="pcb_merge frankenstein_foundation.kicad_pcb out.kicad_pcb changes.txt" />
|
<option name="VM_PARAMETERS" value="" />
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
<option name="PROGRAM_PARAMETERS" value="pcb_merge test.kicad_pcb out.kicad_pcb changes.txt" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="ENV_VARIABLES" />
|
||||||
<module name="pcb_sync" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<envs />
|
<module name="pcb_sync" />
|
||||||
<RunnerSettings RunnerId="Debug">
|
<envs />
|
||||||
<option name="DEBUG_PORT" value="" />
|
<RunnerSettings RunnerId="Debug">
|
||||||
<option name="TRANSPORT" value="0" />
|
<option name="DEBUG_PORT" value="" />
|
||||||
<option name="LOCAL" value="true" />
|
<option name="TRANSPORT" value="0" />
|
||||||
</RunnerSettings>
|
<option name="LOCAL" value="true" />
|
||||||
<RunnerSettings RunnerId="Run" />
|
</RunnerSettings>
|
||||||
<ConfigurationWrapper RunnerId="Debug" />
|
<RunnerSettings RunnerId="Run" />
|
||||||
<ConfigurationWrapper RunnerId="Run" />
|
<ConfigurationWrapper RunnerId="Debug" />
|
||||||
<method />
|
<ConfigurationWrapper RunnerId="Run" />
|
||||||
</configuration>
|
<method />
|
||||||
|
</configuration>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,24 +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">
|
||||||
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
||||||
<option name="VM_PARAMETERS" value="" />
|
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="rename mmc_replace.txt in out" />
|
<option name="VM_PARAMETERS" value="" />
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
<option name="PROGRAM_PARAMETERS" value="rename mmc_replace.txt in out" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="ENV_VARIABLES" />
|
||||||
<module name="pcb_sync" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<envs />
|
<module name="pcb_sync" />
|
||||||
<RunnerSettings RunnerId="Debug">
|
<envs />
|
||||||
<option name="DEBUG_PORT" value="" />
|
<RunnerSettings RunnerId="Debug">
|
||||||
<option name="TRANSPORT" value="0" />
|
<option name="DEBUG_PORT" value="" />
|
||||||
<option name="LOCAL" value="true" />
|
<option name="TRANSPORT" value="0" />
|
||||||
</RunnerSettings>
|
<option name="LOCAL" value="true" />
|
||||||
<RunnerSettings RunnerId="Run" />
|
</RunnerSettings>
|
||||||
<ConfigurationWrapper RunnerId="Debug" />
|
<RunnerSettings RunnerId="Run" />
|
||||||
<ConfigurationWrapper RunnerId="Run" />
|
<ConfigurationWrapper RunnerId="Debug" />
|
||||||
<method />
|
<ConfigurationWrapper RunnerId="Run" />
|
||||||
</configuration>
|
<method />
|
||||||
|
</configuration>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,24 +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">
|
||||||
<option name="MAIN_CLASS_NAME" value="com.rusefi.misc.RemoveUnneededTraces" />
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
||||||
<option name="VM_PARAMETERS" value="" />
|
<option name="MAIN_CLASS_NAME" value="com.rusefi.misc.RemoveUnneededTraces" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="test.kicad_pcb test.kicad_pcb" />
|
<option name="VM_PARAMETERS" value="" />
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
<option name="PROGRAM_PARAMETERS" value="test.kicad_pcb test.kicad_pcb" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="ENV_VARIABLES" />
|
||||||
<module name="pcb_sync" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<envs />
|
<module name="pcb_sync" />
|
||||||
<RunnerSettings RunnerId="Debug">
|
<envs />
|
||||||
<option name="DEBUG_PORT" value="" />
|
<RunnerSettings RunnerId="Debug">
|
||||||
<option name="TRANSPORT" value="0" />
|
<option name="DEBUG_PORT" value="" />
|
||||||
<option name="LOCAL" value="true" />
|
<option name="TRANSPORT" value="0" />
|
||||||
</RunnerSettings>
|
<option name="LOCAL" value="true" />
|
||||||
<RunnerSettings RunnerId="Run" />
|
</RunnerSettings>
|
||||||
<ConfigurationWrapper RunnerId="Debug" />
|
<RunnerSettings RunnerId="Run" />
|
||||||
<ConfigurationWrapper RunnerId="Run" />
|
<ConfigurationWrapper RunnerId="Debug" />
|
||||||
<method />
|
<ConfigurationWrapper RunnerId="Run" />
|
||||||
</configuration>
|
<method />
|
||||||
|
</configuration>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,22 +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">
|
||||||
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
||||||
<option name="VM_PARAMETERS" value="" />
|
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="cmp_merge output\res.cmp 1.cmp 2.cmp" />
|
<option name="VM_PARAMETERS" value="" />
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
<option name="PROGRAM_PARAMETERS" value="cmp_merge output\res.cmp 1.cmp 2.cmp" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH" value="" />
|
||||||
<option name="ENV_VARIABLES" />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
<option name="ENV_VARIABLES" />
|
||||||
<module name="pcb_sync" />
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<envs />
|
<module name="pcb_sync" />
|
||||||
<RunnerSettings RunnerId="Debug">
|
<envs />
|
||||||
<option name="DEBUG_PORT" value="" />
|
<RunnerSettings RunnerId="Debug">
|
||||||
<option name="TRANSPORT" value="0" />
|
<option name="DEBUG_PORT" value="" />
|
||||||
<option name="LOCAL" value="true" />
|
<option name="TRANSPORT" value="0" />
|
||||||
</RunnerSettings>
|
<option name="LOCAL" value="true" />
|
||||||
<ConfigurationWrapper RunnerId="Debug" />
|
</RunnerSettings>
|
||||||
<method />
|
<ConfigurationWrapper RunnerId="Debug" />
|
||||||
</configuration>
|
<method />
|
||||||
|
</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
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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,168 +1,230 @@
|
||||||
package com.rusefi.bom;
|
package com.rusefi.bom;
|
||||||
|
|
||||||
import com.rusefi.util.FileUtils;
|
import com.rusefi.pcb.ModuleNode;
|
||||||
|
import com.rusefi.pcb.PcbNode;
|
||||||
import java.io.BufferedWriter;
|
import com.rusefi.util.FileUtils;
|
||||||
import java.io.FileWriter;
|
|
||||||
import java.io.IOException;
|
import java.io.BufferedWriter;
|
||||||
import java.util.*;
|
import java.io.FileWriter;
|
||||||
|
import java.io.IOException;
|
||||||
/**
|
import java.util.*;
|
||||||
* (c) Andrey Belomutskiy
|
|
||||||
* 2/2/14
|
/**
|
||||||
*/
|
* (c) Andrey Belomutskiy
|
||||||
public class BomBuilder {
|
* 2/2/14
|
||||||
private static final String DELIMITER = ",";
|
*/
|
||||||
|
public class BomBuilder {
|
||||||
private static final CpmFileModel allComponents = new CpmFileModel();
|
private static final String DELIMITER = ",";
|
||||||
private static final String IGNORE_TAG = "ignore";
|
|
||||||
private static String cmpFileName;
|
private static final CpmFileModel allComponents = new CpmFileModel();
|
||||||
private static String bomDictionaryName;
|
private static final String IGNORE_TAG = "ignore";
|
||||||
private static Map<String, BomRecord> bomDictionary;
|
private static String cmpFileName;
|
||||||
private static Set<String> ignoreList = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
|
private static String bomDictionaryName;
|
||||||
|
private static Map<String, BomRecord> bomDictionary;
|
||||||
public static void main(String[] args) throws IOException {
|
private static Set<String> ignoreList = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
|
||||||
if (args.length != 3) {
|
|
||||||
System.out.println("bom_builder [FILE_NAME.CMP] COMPONENTS_DICTIONARY.CSV OUTPUT_FILE.CSV");
|
private static boolean printQtyInFull = true;
|
||||||
return;
|
private static boolean printPadCount = false;
|
||||||
}
|
private static boolean printReference = false;
|
||||||
cmpFileName = args[0];
|
private static boolean printUserComment = false;
|
||||||
bomDictionaryName = args[1];
|
private static PcbNode pcb;
|
||||||
String outputFileName = args[2];
|
|
||||||
|
public static void main(String[] args) throws IOException {
|
||||||
allComponents.readCmpFile(FileUtils.readFileToList(cmpFileName));
|
if (args.length < 3) {
|
||||||
|
System.out.println("bom_builder FILE_NAME.CMP PCB.kicad_pcb COMPONENTS_DICTIONARY.CSV OUTPUT_FILE.CSV");
|
||||||
bomDictionary = readBomDictionary(FileUtils.readFileToList(bomDictionaryName));
|
return;
|
||||||
|
}
|
||||||
writeCompactPartList(outputFileName + "_compact.csv", bomDictionary);
|
cmpFileName = args[0];
|
||||||
writeFullPartList(outputFileName + "_full.csv", bomDictionary);
|
String pcbFileName = args[1];
|
||||||
}
|
bomDictionaryName = args[2];
|
||||||
|
String outputFileName = args[3];
|
||||||
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(); ) {
|
pcb = PcbNode.readFromFile(pcbFileName);
|
||||||
Map.Entry<String, List<BomComponent>> e = i.next();
|
|
||||||
String key = e.getKey();
|
for (int i = 4; i < args.length; i++) {
|
||||||
|
String option = args[i].trim();
|
||||||
if (ignoreList.contains(key))
|
if (option.equalsIgnoreCase("printUserComment")) {
|
||||||
continue;
|
printUserComment = true;
|
||||||
|
} else if (option.equalsIgnoreCase("printreference")) {
|
||||||
BomRecord bomRecord = bomDictionary.get(key);
|
printReference = true;
|
||||||
if (bomRecord == null) {
|
} else if (option.equalsIgnoreCase("printpadcount")) {
|
||||||
bw.write("### no BOM record for " + key + ": " + e.getValue() + "\r\n");
|
printPadCount = true;
|
||||||
i.remove();
|
} else if (option.equalsIgnoreCase("skipqtyinfull")) {
|
||||||
}
|
printQtyInFull = false;
|
||||||
}
|
}
|
||||||
bw.write("\r\n\n\n\n");
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private static void writeFullPartList(String outputFileName, Map<String, BomRecord> bomDictionary) throws IOException {
|
allComponents.readCmpFile(FileUtils.readFileToList(cmpFileName));
|
||||||
BufferedWriter bw = new BufferedWriter(new FileWriter(outputFileName));
|
|
||||||
|
bomDictionary = readBomDictionary(FileUtils.readFileToList(bomDictionaryName));
|
||||||
Map<String, List<BomComponent>> componentsByKey = new TreeMap<String, List<BomComponent>>(allComponents.componentsByKey);
|
|
||||||
|
writeCompactPartList(outputFileName + "_compact.csv", bomDictionary);
|
||||||
log("Writing full parts list to " + outputFileName);
|
writeFullPartList(outputFileName + "_full.csv", bomDictionary);
|
||||||
writeCommonHeader(bw);
|
}
|
||||||
writeMissingElements(bomDictionary, bw, componentsByKey);
|
|
||||||
|
private static void writeMissingElements(Map<String, BomRecord> bomDictionary, BufferedWriter bw, Map<String, List<BomComponent>> componentsByKey) throws IOException {
|
||||||
for (Map.Entry<String, List<BomComponent>> e : componentsByKey.entrySet()) {
|
for (Iterator<Map.Entry<String, List<BomComponent>>> i = componentsByKey.entrySet().iterator(); i.hasNext(); ) {
|
||||||
String key = e.getKey();
|
Map.Entry<String, List<BomComponent>> e = i.next();
|
||||||
List<BomComponent> list = e.getValue();
|
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) {
|
||||||
throw new NullPointerException();
|
bw.write("### no BOM record for " + key + ": " + e.getValue() + "\r\n");
|
||||||
|
i.remove();
|
||||||
for (BomComponent c : list)
|
}
|
||||||
writeLine(bw, bomRecord, 1, c.getReference() + ": ");
|
}
|
||||||
}
|
bw.write("\r\n\n\n\n");
|
||||||
bw.close();
|
}
|
||||||
}
|
|
||||||
|
private static void writeFullPartList(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 full 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()) {
|
StringBuilder notMounted = new StringBuilder();
|
||||||
String key = e.getKey();
|
|
||||||
|
for (Map.Entry<String, List<BomComponent>> e : componentsByKey.entrySet()) {
|
||||||
if (ignoreList.contains(key))
|
// for instance, SM0805_47pF
|
||||||
continue;
|
String componentName = e.getKey();
|
||||||
|
|
||||||
List<BomComponent> list = e.getValue();
|
List<BomComponent> list = e.getValue();
|
||||||
log(list.size() + " items of " + key);
|
|
||||||
|
if (ignoreList.contains(componentName))
|
||||||
BomRecord bomRecord = bomDictionary.get(key);
|
continue;
|
||||||
if (bomRecord == null)
|
|
||||||
throw new NullPointerException();
|
BomRecord bomRecord = bomDictionary.get(componentName);
|
||||||
writeLine(bw, bomRecord, list.size(), "");
|
if (bomRecord == null)
|
||||||
}
|
throw new NullPointerException();
|
||||||
bw.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void writeCommonHeader(BufferedWriter bw) throws IOException {
|
|
||||||
bw.write("### this file was generated by rusEfi bom_builder on " + new Date() + "\r\n");
|
for (BomComponent c : list) {
|
||||||
bw.write("### " + allComponents.componentsCount + " components in " + allComponents.linesCount + " lines of " + cmpFileName + "\r\n");
|
if (!findModule(c.getReference())) {
|
||||||
bw.write("### " + allComponents.componentsByKey.size() + " kinds of components in input file\r\n");
|
bw.write("Not mounted: " + c.getReference() + "\r\n");
|
||||||
bw.write("### " + bomDictionary.size() + " entries in BOM dictionary " + bomDictionaryName + "\r\n");
|
continue;
|
||||||
bw.write("### " + ignoreList.size() + " entries in ignore list\r\n");
|
}
|
||||||
}
|
writeLine(bw, bomRecord, 1, c.getReference() + ": ", c.getReference());
|
||||||
|
}
|
||||||
private static void writeLine(BufferedWriter bw, BomRecord bomRecord, int quantity, String prefix) throws IOException {
|
}
|
||||||
bw.write(quantity + DELIMITER +
|
bw.close();
|
||||||
bomRecord.getStorePart() + DELIMITER +
|
}
|
||||||
prefix + bomRecord.getCustomerRef() + "\r\n");
|
|
||||||
}
|
private static boolean findModule(String reference) {
|
||||||
|
for (PcbNode node : pcb.iterate("module")) {
|
||||||
private static Map<String, BomRecord> readBomDictionary(List<String> strings) {
|
if (node instanceof ModuleNode) {
|
||||||
Map<String, BomRecord> result = new TreeMap<String, BomRecord>(String.CASE_INSENSITIVE_ORDER);
|
ModuleNode mn = (ModuleNode) node;
|
||||||
for (String line : strings) {
|
if (mn.getReference().equalsIgnoreCase(reference))
|
||||||
line = line.trim();
|
return true;
|
||||||
if (line.isEmpty())
|
}
|
||||||
continue;
|
}
|
||||||
|
return false;
|
||||||
if (line.startsWith("#")) {
|
}
|
||||||
log("Skipping comment: " + line);
|
|
||||||
continue;
|
private static void writeCompactPartList(String outputFileName, Map<String, BomRecord> bomDictionary) throws IOException {
|
||||||
}
|
BufferedWriter bw = new BufferedWriter(new FileWriter(outputFileName));
|
||||||
|
Map<String, List<BomComponent>> componentsByKey = new TreeMap<String, List<BomComponent>>(allComponents.componentsByKey);
|
||||||
String[] tokens = line.split(",");
|
|
||||||
|
log("Writing compact parts list to " + outputFileName);
|
||||||
if (tokens.length != 4) {
|
writeCommonHeader(bw);
|
||||||
log("Unexpected line: " + line + " Expected 4 tokens but " + tokens.length);
|
writeMissingElements(bomDictionary, bw, componentsByKey);
|
||||||
System.exit(-1);
|
|
||||||
}
|
for (Map.Entry<String, List<BomComponent>> e : componentsByKey.entrySet()) {
|
||||||
|
// for instance, SM0805_47pF
|
||||||
String ref = tokens[0];
|
String componentName = e.getKey();
|
||||||
String mfgPart = tokens[1];
|
|
||||||
String storePart = tokens[2];
|
if (ignoreList.contains(componentName))
|
||||||
String customerRef = tokens[3];
|
continue;
|
||||||
|
|
||||||
if (storePart.equalsIgnoreCase(IGNORE_TAG)) {
|
List<BomComponent> list = e.getValue();
|
||||||
log("Ignore entry: " + ref);
|
log(list.size() + " items of " + componentName);
|
||||||
ignoreList.add(ref);
|
|
||||||
continue;
|
BomRecord bomRecord = bomDictionary.get(componentName);
|
||||||
}
|
if (bomRecord == null)
|
||||||
|
throw new NullPointerException();
|
||||||
result.put(ref, new BomRecord(mfgPart, storePart, customerRef));
|
writeLine(bw, bomRecord, list.size(), "", "");
|
||||||
|
}
|
||||||
log("BOM key: " + ref);
|
bw.close();
|
||||||
log("mfgPartNo: " + mfgPart);
|
}
|
||||||
log("storePartNo: " + storePart);
|
|
||||||
}
|
private static void writeCommonHeader(BufferedWriter bw) throws IOException {
|
||||||
|
bw.write("### this file was generated by rusEfi bom_builder on " + new Date() + "\r\n");
|
||||||
log("Got " + result.size() + " entries in BOM dictionary");
|
bw.write("### " + allComponents.componentsCount + " components in " + allComponents.linesCount + " lines of " + cmpFileName + "\r\n");
|
||||||
log("Got " + ignoreList.size() + " entries in ignore list");
|
bw.write("### " + allComponents.componentsByKey.size() + " kinds of components in input file\r\n");
|
||||||
return result;
|
bw.write("### " + bomDictionary.size() + " entries in BOM dictionary " + bomDictionaryName + "\r\n");
|
||||||
}
|
bw.write("### " + ignoreList.size() + " entries in ignore list\r\n");
|
||||||
|
}
|
||||||
protected static void log(String msg) {
|
|
||||||
System.out.println(msg);
|
private static void writeLine(BufferedWriter bw, BomRecord bomRecord, int quantity, String prefix, String reference) throws IOException {
|
||||||
}
|
bw.write(quantity + DELIMITER +
|
||||||
}
|
bomRecord.getStorePart() + DELIMITER +
|
||||||
|
prefix + bomRecord.getCustomerRef() + DELIMITER +
|
||||||
|
(printReference ? reference + DELIMITER : "") +
|
||||||
|
(printUserComment ? bomRecord.getUserComment() + DELIMITER : "") +
|
||||||
|
(printPadCount ? bomRecord.getPadCount() + DELIMITER : "") +
|
||||||
|
"\r\n"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<String, BomRecord> readBomDictionary(List<String> strings) {
|
||||||
|
Map<String, BomRecord> result = new TreeMap<String, BomRecord>(String.CASE_INSENSITIVE_ORDER);
|
||||||
|
for (String line : strings) {
|
||||||
|
line = line.trim();
|
||||||
|
if (line.isEmpty())
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (line.startsWith("#")) {
|
||||||
|
log("Skipping comment: " + line);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
String[] tokens = line.split(",");
|
||||||
|
|
||||||
|
if (tokens.length < 2) {
|
||||||
|
log("Unexpected line: " + line + " Expected at least two tokens but " + tokens.length);
|
||||||
|
System.exit(-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
String ref = tokens[0];
|
||||||
|
String mfgPart = tokens[1];
|
||||||
|
|
||||||
|
if (mfgPart.equalsIgnoreCase(IGNORE_TAG)) {
|
||||||
|
log("Ignoring entry: " + ref);
|
||||||
|
ignoreList.add(ref);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tokens.length != 6) {
|
||||||
|
log("Unexpected line: [" + line + "] Expected 6 tokens but " + tokens.length);
|
||||||
|
System.exit(-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
String storePart = tokens[2];
|
||||||
|
String componentName = tokens[3];
|
||||||
|
int padCount = Integer.parseInt(tokens[4]);
|
||||||
|
String customerRef = tokens[5];
|
||||||
|
|
||||||
|
result.put(ref, new BomRecord(mfgPart, storePart, customerRef, padCount, componentName));
|
||||||
|
|
||||||
|
log("BOM key: " + ref);
|
||||||
|
log("mfgPartNo: " + mfgPart);
|
||||||
|
log("storePartNo: " + storePart);
|
||||||
|
}
|
||||||
|
|
||||||
|
log("Got " + result.size() + " entries in BOM dictionary");
|
||||||
|
log("Got " + ignoreList.size() + " entries in ignore list");
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected static void log(String 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,29 +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;
|
||||||
public BomRecord(String mfgPart, String storePart, String customerRef) {
|
private final String userComment;
|
||||||
this.mfgPart = mfgPart;
|
|
||||||
this.storePart = storePart;
|
public BomRecord(String mfgPart, String storePart, String customerRef, int padCount, String userComment) {
|
||||||
this.customerRef = customerRef;
|
this.mfgPart = mfgPart;
|
||||||
}
|
this.storePart = storePart;
|
||||||
|
this.customerRef = customerRef;
|
||||||
public String getMfgPart() {
|
this.padCount = padCount;
|
||||||
return mfgPart;
|
this.userComment = userComment;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getStorePart() {
|
public String getMfgPart() {
|
||||||
return storePart;
|
return mfgPart;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getCustomerRef() {
|
public String getStorePart() {
|
||||||
return customerRef;
|
return storePart;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public String getCustomerRef() {
|
||||||
|
return customerRef;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getPadCount() {
|
||||||
|
return padCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getUserComment() {
|
||||||
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,97 +1,105 @@
|
||||||
package com.rusefi.misc;
|
package com.rusefi.misc;
|
||||||
|
|
||||||
import com.rusefi.util.FileUtils;
|
import com.rusefi.util.FileUtils;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
import static com.rusefi.pcb.PcbMergeTool.log;
|
||||||
import java.util.TreeSet;
|
|
||||||
|
/**
|
||||||
import static com.rusefi.pcb.PcbMergeTool.log;
|
* 1/19/14
|
||||||
|
* (c) Andrey Belomutskiy
|
||||||
/**
|
*/
|
||||||
* 1/19/14
|
public class ChangesModel {
|
||||||
* (c) Andrey Belomutskiy
|
private static final ChangesModel instance = new ChangesModel();
|
||||||
*/
|
private static final String REMOVE = "remove";
|
||||||
public class ChangesModel {
|
private static final String ADD = "add";
|
||||||
private static final ChangesModel instance = new ChangesModel();
|
private static final String MOVE = "move_module";
|
||||||
private static final String REMOVE = "remove";
|
private static final String OPTIMIZE = "optimize";
|
||||||
private static final String ADD = "add";
|
private static final String COPY = "copy";
|
||||||
private static final String MOVE = "move_module";
|
private static final String MERGE_NET = "merge_net";
|
||||||
private static final String OPTIMIZE = "optimize";
|
|
||||||
private static final String COPY = "copy";
|
public final Set<String> DEL_REQUESTS = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
|
||||||
|
public final List<NameAndOffset> ADD_REQUESTS = new ArrayList<NameAndOffset>();
|
||||||
public final Set<String> DEL_REQUESTS = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
|
public final List<NameAndOffset> MOVE_REQUESTS = new ArrayList<NameAndOffset>();
|
||||||
public final List<NameAndOffset> ADD_REQUESTS = new ArrayList<NameAndOffset>();
|
|
||||||
public final List<NameAndOffset> MOVE_REQUESTS = new ArrayList<NameAndOffset>();
|
public final List<TwoFileRequest> OPTIMIZE_REQUESTS = new ArrayList<TwoFileRequest>();
|
||||||
|
public final List<TwoFileRequest> COPY_REQUESTS = new ArrayList<TwoFileRequest>();
|
||||||
public final List<TwoFileRequest> OPTIMIZE_REQUESTS = new ArrayList<TwoFileRequest>();
|
/**
|
||||||
public final List<TwoFileRequest> COPY_REQUESTS = new ArrayList<TwoFileRequest>();
|
* Old net name > New net name
|
||||||
|
*/
|
||||||
public static ChangesModel getInstance() {
|
public final Map<String, String> NET_MERGE_REQUESTS = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
|
||||||
return instance;
|
|
||||||
}
|
public static ChangesModel getInstance() {
|
||||||
|
return instance;
|
||||||
public static void readConfiguration(String fileName) throws IOException {
|
}
|
||||||
if (!new File(fileName).isFile()) {
|
|
||||||
log("No such file: " + fileName);
|
public static void readConfiguration(String fileName) throws IOException {
|
||||||
return;
|
if (!new File(fileName).isFile()) {
|
||||||
}
|
log("No such file: " + fileName);
|
||||||
log("Reading commands from " + fileName);
|
return;
|
||||||
List<String> a = FileUtils.readFileToList(fileName);
|
}
|
||||||
|
log("Reading commands from " + fileName);
|
||||||
getInstance().read(a);
|
List<String> a = FileUtils.readFileToList(fileName);
|
||||||
}
|
|
||||||
|
getInstance().read(a);
|
||||||
public void read(List<String> lines) {
|
}
|
||||||
int lineIndex = 0;
|
|
||||||
for (String line : lines) {
|
public void read(List<String> lines) {
|
||||||
lineIndex++;
|
int lineIndex = 0;
|
||||||
line = line.trim();
|
for (String line : lines) {
|
||||||
if (line.isEmpty())
|
lineIndex++;
|
||||||
continue;
|
line = line.trim();
|
||||||
if (line.startsWith("#"))
|
if (line.isEmpty())
|
||||||
continue; // this line is a comment
|
continue;
|
||||||
|
if (line.startsWith("#"))
|
||||||
if (line.toLowerCase().startsWith(REMOVE)) {
|
continue; // this line is a comment
|
||||||
DEL_REQUESTS.add(line.substring(REMOVE.length()).trim());
|
|
||||||
continue;
|
if (line.toLowerCase().startsWith(REMOVE)) {
|
||||||
} else if (line.toLowerCase().startsWith(ADD)) {
|
DEL_REQUESTS.add(line.substring(REMOVE.length()).trim());
|
||||||
addAddRequest(line.substring(ADD.length()).trim());
|
continue;
|
||||||
continue;
|
} else if (line.toLowerCase().startsWith(ADD)) {
|
||||||
} else if (line.toLowerCase().startsWith(MOVE)) {
|
addAddRequest(line.substring(ADD.length()).trim());
|
||||||
addMoveRequest(line.substring(MOVE.length()).trim());
|
continue;
|
||||||
continue;
|
} else if (line.toLowerCase().startsWith(MOVE)) {
|
||||||
} else if (line.toLowerCase().startsWith(OPTIMIZE)) {
|
addMoveRequest(line.substring(MOVE.length()).trim());
|
||||||
OPTIMIZE_REQUESTS.add(TwoFileRequest.parseTwoFile(line.substring(OPTIMIZE.length()).trim(), lineIndex));
|
continue;
|
||||||
continue;
|
} else if (line.toLowerCase().startsWith(OPTIMIZE)) {
|
||||||
} else if (line.toLowerCase().startsWith(COPY)) {
|
OPTIMIZE_REQUESTS.add(TwoFileRequest.parseTwoFile(line.substring(OPTIMIZE.length()).trim(), lineIndex));
|
||||||
COPY_REQUESTS.add(TwoFileRequest.parseTwoFile(line.substring(COPY.length()).trim(), lineIndex));
|
continue;
|
||||||
continue;
|
} else if (line.toLowerCase().startsWith(COPY)) {
|
||||||
}
|
COPY_REQUESTS.add(TwoFileRequest.parseTwoFile(line.substring(COPY.length()).trim(), lineIndex));
|
||||||
|
continue;
|
||||||
System.err.println("ChangesModel: Ignoring invalid line: " + line);
|
} else if (line.toLowerCase().startsWith(MERGE_NET)) {
|
||||||
|
TwoFileRequest req = TwoFileRequest.parseTwoFile(line.substring(MERGE_NET.length()).trim(), lineIndex);
|
||||||
}
|
NET_MERGE_REQUESTS.put(req.input, req.output);
|
||||||
log("Got " + DEL_REQUESTS.size() + " remove request(s)");
|
log("Net " + req.input + " to be merged into " + req.output);
|
||||||
log("Got " + ADD_REQUESTS.size() + " add request(s)");
|
continue;
|
||||||
log("Got " + OPTIMIZE_REQUESTS.size() + " optimize request(s)");
|
}
|
||||||
}
|
|
||||||
|
System.err.println("ChangesModel: Ignoring invalid line: " + line);
|
||||||
private void addMoveRequest(String request) {
|
|
||||||
MOVE_REQUESTS.add(NameAndOffset.parseNameAndOffset(request));
|
}
|
||||||
}
|
log("Got " + DEL_REQUESTS.size() + " remove request(s)");
|
||||||
|
log("Got " + ADD_REQUESTS.size() + " add request(s)");
|
||||||
private void addAddRequest(String request) {
|
log("Got " + OPTIMIZE_REQUESTS.size() + " optimize request(s)");
|
||||||
ADD_REQUESTS.add(NameAndOffset.parseNameAndOffset(request));
|
log("Got " + NET_MERGE_REQUESTS.size() + " merge net request(s)");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void clear() {
|
private void addMoveRequest(String request) {
|
||||||
DEL_REQUESTS.clear();
|
MOVE_REQUESTS.add(NameAndOffset.parseNameAndOffset(request));
|
||||||
ADD_REQUESTS.clear();
|
}
|
||||||
OPTIMIZE_REQUESTS.clear();
|
|
||||||
MOVE_REQUESTS.clear();
|
private void addAddRequest(String request) {
|
||||||
}
|
ADD_REQUESTS.add(NameAndOffset.parseNameAndOffset(request));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void clear() {
|
||||||
|
DEL_REQUESTS.clear();
|
||||||
|
ADD_REQUESTS.clear();
|
||||||
|
OPTIMIZE_REQUESTS.clear();
|
||||||
|
MOVE_REQUESTS.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,43 +1,43 @@
|
||||||
package com.rusefi.misc;
|
package com.rusefi.misc;
|
||||||
|
|
||||||
import com.rusefi.util.FileUtils;
|
import com.rusefi.util.FileUtils;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 12/8/13
|
* 12/8/13
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
*/
|
*/
|
||||||
public class CmpMergeTool {
|
public class CmpMergeTool {
|
||||||
private CmpMergeTool() {
|
private CmpMergeTool() {
|
||||||
}
|
}
|
||||||
|
|
||||||
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 = FileUtils.readFileToList(sourceFile);
|
List<String> list = FileUtils.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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,36 +1,36 @@
|
||||||
package com.rusefi.misc;
|
package com.rusefi.misc;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Andrey Belomutskiy
|
* @author Andrey Belomutskiy
|
||||||
* 1/24/14
|
* 1/24/14
|
||||||
*/
|
*/
|
||||||
public class NameAndOffset {
|
public class NameAndOffset {
|
||||||
private final String name;
|
private final String name;
|
||||||
public final double x;
|
public final double x;
|
||||||
public final double y;
|
public final double y;
|
||||||
|
|
||||||
public NameAndOffset(String name, double x, double y) {
|
public NameAndOffset(String name, double x, double y) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.x = x;
|
this.x = x;
|
||||||
this.y = y;
|
this.y = y;
|
||||||
}
|
}
|
||||||
|
|
||||||
static NameAndOffset parseNameAndOffset(String request) {
|
static NameAndOffset parseNameAndOffset(String request) {
|
||||||
String[] tokens = request.split(" ");
|
String[] tokens = request.split(" ");
|
||||||
NameAndOffset result;
|
NameAndOffset result;
|
||||||
if (tokens.length == 1) {
|
if (tokens.length == 1) {
|
||||||
result = new NameAndOffset(tokens[0], 0, 0);
|
result = new NameAndOffset(tokens[0], 0, 0);
|
||||||
} else if (tokens.length == 3) {
|
} else if (tokens.length == 3) {
|
||||||
double x = Double.parseDouble(tokens[1]);
|
double x = Double.parseDouble(tokens[1]);
|
||||||
double y = Double.parseDouble(tokens[2]);
|
double y = Double.parseDouble(tokens[2]);
|
||||||
result = new NameAndOffset(tokens[0], x, y);
|
result = new NameAndOffset(tokens[0], x, y);
|
||||||
} else {
|
} else {
|
||||||
throw new IllegalArgumentException("Invalid: " + request);
|
throw new IllegalArgumentException("Invalid: " + request);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,138 +1,138 @@
|
||||||
package com.rusefi.misc;
|
package com.rusefi.misc;
|
||||||
|
|
||||||
import com.rusefi.pcb.*;
|
import com.rusefi.pcb.*;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Andrey Belomutskiy
|
* @author Andrey Belomutskiy
|
||||||
* 1/21/14
|
* 1/21/14
|
||||||
*/
|
*/
|
||||||
public class RemoveUnneededTraces {
|
public class RemoveUnneededTraces {
|
||||||
private final static Set<String> alreadyRemoved = new HashSet<String>();
|
private final static Set<String> alreadyRemoved = new HashSet<String>();
|
||||||
|
|
||||||
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: INPUT_FILE OUTPUT_FILE");
|
System.out.println("two parameters expected: INPUT_FILE OUTPUT_FILE");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
String input = args[0];
|
String input = args[0];
|
||||||
String output = args[1];
|
String output = args[1];
|
||||||
|
|
||||||
optimize(input, output);
|
optimize(input, output);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void optimize(String input, String output) throws IOException {
|
public static void optimize(String input, String output) throws IOException {
|
||||||
PcbNode destNode = PcbNode.readFromFile(input);
|
PcbNode destNode = PcbNode.readFromFile(input);
|
||||||
|
|
||||||
|
|
||||||
while (removeUnusedSegments(destNode) || removeUnusedVias(destNode)) {
|
while (removeUnusedSegments(destNode) || removeUnusedVias(destNode)) {
|
||||||
System.out.println("Still removing...");
|
System.out.println("Still removing...");
|
||||||
}
|
}
|
||||||
|
|
||||||
destNode.write(output);
|
destNode.write(output);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean removeUnusedVias(PcbNode destNode) {
|
private static boolean removeUnusedVias(PcbNode destNode) {
|
||||||
List<ViaNode> unused = findUnusedVias(destNode);
|
List<ViaNode> unused = findUnusedVias(destNode);
|
||||||
for (ViaNode via : unused) {
|
for (ViaNode via : unused) {
|
||||||
System.out.println("Removing via: " + via);
|
System.out.println("Removing via: " + via);
|
||||||
boolean removed = destNode.removeChild(via);
|
boolean removed = destNode.removeChild(via);
|
||||||
if (!removed)
|
if (!removed)
|
||||||
throw new IllegalStateException("not removed: " + removed);
|
throw new IllegalStateException("not removed: " + removed);
|
||||||
|
|
||||||
}
|
}
|
||||||
return !unused.isEmpty();
|
return !unused.isEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<ViaNode> findUnusedVias(PcbNode destNode) {
|
private static List<ViaNode> findUnusedVias(PcbNode destNode) {
|
||||||
List<ViaNode> result = new ArrayList<ViaNode>();
|
List<ViaNode> result = new ArrayList<ViaNode>();
|
||||||
|
|
||||||
List<PcbNode> stuff = destNode.iterate("segment");
|
List<PcbNode> stuff = destNode.iterate("segment");
|
||||||
// stuff.addAll(destNode.iterate("segment"));
|
// stuff.addAll(destNode.iterate("segment"));
|
||||||
|
|
||||||
for (PcbNode n : destNode.iterate("via")) {
|
for (PcbNode n : destNode.iterate("via")) {
|
||||||
ViaNode via = (ViaNode) n;
|
ViaNode via = (ViaNode) n;
|
||||||
|
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
for (PcbNode segment : stuff)
|
for (PcbNode segment : stuff)
|
||||||
if (segment.isConnected(via.location))
|
if (segment.isConnected(via.location))
|
||||||
count++;
|
count++;
|
||||||
|
|
||||||
if (via.netId == NetNode.GND_NET_ID) {
|
if (via.netId == NetNode.GND_NET_ID) {
|
||||||
if (count == 0)
|
if (count == 0)
|
||||||
result.add(via);
|
result.add(via);
|
||||||
} else {
|
} else {
|
||||||
if (count < 2)
|
if (count < 2)
|
||||||
result.add(via);
|
result.add(via);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean removeUnusedSegments(PcbNode destNode) {
|
private static boolean removeUnusedSegments(PcbNode destNode) {
|
||||||
List<PcbNode> stuff = new ArrayList<PcbNode>(destNode.iterate("module"));
|
List<PcbNode> stuff = new ArrayList<PcbNode>(destNode.iterate("module"));
|
||||||
stuff.addAll(destNode.iterate("via"));
|
stuff.addAll(destNode.iterate("via"));
|
||||||
|
|
||||||
|
|
||||||
Object o = destNode.iterate("segment");
|
Object o = destNode.iterate("segment");
|
||||||
List<SegmentNode> segments = (List<SegmentNode>) o;
|
List<SegmentNode> segments = (List<SegmentNode>) o;
|
||||||
System.out.println(segments.size() + " segment(s)");
|
System.out.println(segments.size() + " segment(s)");
|
||||||
|
|
||||||
List<SegmentNode> unused = findUnusedSegments(segments, stuff);
|
List<SegmentNode> unused = findUnusedSegments(segments, stuff);
|
||||||
for (SegmentNode segment : unused) {
|
for (SegmentNode segment : unused) {
|
||||||
boolean removed = destNode.removeChild(segment);
|
boolean removed = destNode.removeChild(segment);
|
||||||
if (!removed)
|
if (!removed)
|
||||||
throw new IllegalStateException();
|
throw new IllegalStateException();
|
||||||
String netName = segment.net.id;
|
String netName = segment.net.id;
|
||||||
if (!alreadyRemoved.contains(netName)) {
|
if (!alreadyRemoved.contains(netName)) {
|
||||||
alreadyRemoved.add(netName);
|
alreadyRemoved.add(netName);
|
||||||
System.out.println("Unused segment in network " + netName + ": " + segment);
|
System.out.println("Unused segment in network " + netName + ": " + segment);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return !unused.isEmpty();
|
return !unused.isEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<SegmentNode> findUnusedSegments(List<SegmentNode> segments, List<PcbNode> modules) {
|
private static List<SegmentNode> findUnusedSegments(List<SegmentNode> segments, List<PcbNode> modules) {
|
||||||
List<SegmentNode> unused = new ArrayList<SegmentNode>();
|
List<SegmentNode> unused = new ArrayList<SegmentNode>();
|
||||||
for (SegmentNode segment : segments) {
|
for (SegmentNode segment : segments) {
|
||||||
if (isUnused(segments, segment, modules)) {
|
if (isUnused(segments, segment, modules)) {
|
||||||
// System.out.println("Unused on " + segment.net.id + ": " + segment);
|
// System.out.println("Unused on " + segment.net.id + ": " + segment);
|
||||||
unused.add(segment);
|
unused.add(segment);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return unused;
|
return unused;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isUnused(List<SegmentNode> segments, SegmentNode segment, List<PcbNode> modules) {
|
public static boolean isUnused(List<SegmentNode> segments, SegmentNode segment, List<PcbNode> modules) {
|
||||||
PointNode start = segment.start;
|
PointNode start = segment.start;
|
||||||
PointNode end = segment.end;
|
PointNode end = segment.end;
|
||||||
if (isConnected(start, segments, segment) == null && isConnected(start, modules, null) == null) {
|
if (isConnected(start, segments, segment) == null && isConnected(start, modules, null) == null) {
|
||||||
System.out.println("Not connected start: " + segment);
|
System.out.println("Not connected start: " + segment);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
PcbNode endModule = isConnected(end, modules, null);
|
PcbNode endModule = isConnected(end, modules, null);
|
||||||
if (isConnected(end, segments, segment) == null && endModule == null) {
|
if (isConnected(end, segments, segment) == null && endModule == null) {
|
||||||
System.out.println("Not connected end: " + segment);
|
System.out.println("Not connected end: " + segment);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static PcbNode isConnected(PointNode point, List<? extends PcbNode> elements, SegmentNode parent) {
|
private static PcbNode isConnected(PointNode point, List<? extends PcbNode> elements, SegmentNode parent) {
|
||||||
for (PcbNode segmentNode : elements) {
|
for (PcbNode segmentNode : elements) {
|
||||||
if (segmentNode == parent)
|
if (segmentNode == parent)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (segmentNode.isConnected(point))
|
if (segmentNode.isConnected(point))
|
||||||
return segmentNode;
|
return segmentNode;
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,23 @@
|
||||||
package com.rusefi.misc;
|
package com.rusefi.misc;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Andrey Belomutskiy
|
* @author Andrey Belomutskiy
|
||||||
* 1/24/14
|
* 1/24/14
|
||||||
*/
|
*/
|
||||||
public class TwoFileRequest {
|
public class TwoFileRequest {
|
||||||
public final String input;
|
public final String input;
|
||||||
public final String output;
|
public final String output;
|
||||||
|
|
||||||
public TwoFileRequest(String input, String output) {
|
public TwoFileRequest(String input, String output) {
|
||||||
this.input = input;
|
this.input = input;
|
||||||
this.output = output;
|
this.output = output;
|
||||||
}
|
}
|
||||||
|
|
||||||
static TwoFileRequest parseTwoFile(String request, int lineIndex) {
|
static TwoFileRequest parseTwoFile(String request, int lineIndex) {
|
||||||
String[] tokens = request.split(" ");
|
String[] tokens = request.split(" ");
|
||||||
if (tokens.length != 2)
|
if (tokens.length != 2)
|
||||||
throw new IllegalArgumentException("Unexpected token count in [" + request + "] @" + lineIndex);
|
throw new IllegalArgumentException("Unexpected token count in [" + request + "] @" + lineIndex);
|
||||||
|
|
||||||
return new TwoFileRequest(tokens[0], tokens[1]);
|
return new TwoFileRequest(tokens[0], tokens[1]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,22 @@
|
||||||
package com.rusefi.pcb;
|
package com.rusefi.pcb;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 1/21/14.
|
* 1/21/14.
|
||||||
*/
|
*/
|
||||||
public class CirclePadNode extends PadNode {
|
public class CirclePadNode extends PadNode {
|
||||||
public CirclePadNode(String nodeName, int i, List<Object> children) {
|
public CirclePadNode(String nodeName, int i, List<Object> children) {
|
||||||
super(nodeName, i, children);
|
super(nodeName, i, children);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "CirclePadNode{" +
|
return "CirclePadNode{" +
|
||||||
"at=" + at +
|
"at=" + at +
|
||||||
", size=" + size +
|
", size=" + size +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,15 @@
|
||||||
package com.rusefi.pcb;
|
package com.rusefi.pcb;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Andrey Belomutskiy
|
* @author Andrey Belomutskiy
|
||||||
* 2/7/14.
|
* 2/7/14.
|
||||||
*/
|
*/
|
||||||
public class GrLineNode extends PcbNode {
|
public class GrLineNode extends PcbNode {
|
||||||
public final LayerNode layerNode;
|
public final LayerNode layerNode;
|
||||||
public GrLineNode(String nodeName, int i, List<Object> children) {
|
public GrLineNode(String nodeName, int i, List<Object> children) {
|
||||||
super(nodeName, i, children);
|
super(nodeName, i, children);
|
||||||
layerNode = (LayerNode) find("layer");
|
layerNode = (LayerNode) find("layer");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,20 @@
|
||||||
package com.rusefi.pcb;
|
package com.rusefi.pcb;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Andrey Belomutskiy
|
* @author Andrey Belomutskiy
|
||||||
* 2/7/14.
|
* 2/7/14.
|
||||||
*/
|
*/
|
||||||
public class LayerNode extends PcbNode {
|
public class LayerNode extends PcbNode {
|
||||||
public final String name;
|
public final String name;
|
||||||
|
|
||||||
public LayerNode(String nodeName, int closingIndex, List<Object> children) {
|
public LayerNode(String nodeName, int closingIndex, List<Object> children) {
|
||||||
super(nodeName, closingIndex, children);
|
super(nodeName, closingIndex, children);
|
||||||
name = (String) children.get(0);
|
name = (String) children.get(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean isSikscreenLayer() {
|
boolean isSikscreenLayer() {
|
||||||
return name.equals("B.SilkS") || name.equals("F.SilkS");
|
return name.equals("B.SilkS") || name.equals("F.SilkS");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,41 +1,45 @@
|
||||||
package com.rusefi.pcb;
|
package com.rusefi.pcb;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Andrey Belomutskiy
|
* @author Andrey Belomutskiy
|
||||||
* 1/21/14
|
* 1/21/14
|
||||||
*/
|
*/
|
||||||
public class ModuleNode extends PcbNode {
|
public class ModuleNode extends PcbNode {
|
||||||
final List<PadNode> pads;
|
final List<PadNode> pads;
|
||||||
public final PointNode at;
|
public final PointNode at;
|
||||||
public final String name;
|
private final String reference;
|
||||||
|
|
||||||
public ModuleNode(String nodeName, int i, List<Object> children) {
|
public ModuleNode(String nodeName, int i, List<Object> children) {
|
||||||
super(nodeName, i, children);
|
super(nodeName, i, children);
|
||||||
Object o = iterate("pad");
|
Object o = iterate("pad");
|
||||||
pads = (List<PadNode>) o;
|
pads = (List<PadNode>) o;
|
||||||
at = (PointNode) find("at");
|
at = (PointNode) find("at");
|
||||||
|
|
||||||
name = iterate("fp_text").get(0).getChild(1);
|
reference = iterate("fp_text").get(0).getChild(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
public String getReference() {
|
||||||
public String toString() {
|
return reference;
|
||||||
return "ModuleNode{" +
|
}
|
||||||
"name=" + name +
|
|
||||||
", pads.size=" + pads.size() +
|
@Override
|
||||||
'}';
|
public String toString() {
|
||||||
}
|
return "ModuleNode{" +
|
||||||
|
"reference=" + reference +
|
||||||
@Override
|
", pads.size=" + pads.size() +
|
||||||
public boolean isConnected(PointNode point) {
|
'}';
|
||||||
PointNode offsetPoint = at.translate(point);
|
}
|
||||||
|
|
||||||
for (PadNode pad : pads) {
|
@Override
|
||||||
if (pad.isConnected(offsetPoint))
|
public boolean isConnected(PointNode point) {
|
||||||
return true;
|
PointNode offsetPoint = at.translate(point);
|
||||||
}
|
|
||||||
return false;
|
for (PadNode pad : pads) {
|
||||||
}
|
if (pad.isConnected(offsetPoint))
|
||||||
}
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,31 +1,31 @@
|
||||||
package com.rusefi.pcb;
|
package com.rusefi.pcb;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Andrey Belomutskiy
|
* @author Andrey Belomutskiy
|
||||||
* 1/21/14
|
* 1/21/14
|
||||||
*/
|
*/
|
||||||
public class NetNode extends PcbNode {
|
public class NetNode extends PcbNode {
|
||||||
public final String id;
|
public final String id;
|
||||||
final String name;
|
final String name;
|
||||||
public static int GND_NET_ID;
|
public static int GND_NET_ID;
|
||||||
|
|
||||||
public NetNode(String nodeName, int i, List<Object> children) {
|
public NetNode(String nodeName, int i, List<Object> children) {
|
||||||
super(nodeName, i, children);
|
super(nodeName, i, children);
|
||||||
id = getChild(0);
|
id = getChild(0);
|
||||||
name = children.size() > 1 ? getChild(1) : null;
|
name = children.size() > 1 ? getChild(1) : null;
|
||||||
if (name != null)
|
if (name != null)
|
||||||
System.out.println(name + " network: " + id);
|
System.out.println("NetNode(" + name + " network: " + id + ")");
|
||||||
|
|
||||||
if ("GND".equalsIgnoreCase(name))
|
if ("GND".equalsIgnoreCase(name))
|
||||||
GND_NET_ID = Integer.parseInt(id);
|
GND_NET_ID = Integer.parseInt(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "NetNode{" +
|
return "NetNode{" +
|
||||||
"id='" + id + '\'' +
|
"id='" + id + '\'' +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,42 +1,44 @@
|
||||||
package com.rusefi.pcb;
|
package com.rusefi.pcb;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 1/21/14.
|
* 1/21/14.
|
||||||
*/
|
*/
|
||||||
public abstract class PadNode extends PcbNode {
|
public abstract class PadNode extends PcbNode {
|
||||||
protected final PointNode at;
|
protected final PointNode at;
|
||||||
protected final SizeNode size;
|
protected final SizeNode size;
|
||||||
protected final String name;
|
protected final String name;
|
||||||
|
|
||||||
public PadNode(String nodeName, int i, List<Object> children) {
|
public PadNode(String nodeName, int i, List<Object> children) {
|
||||||
super(nodeName, i, children);
|
super(nodeName, i, children);
|
||||||
name = (String) children.get(0);
|
name = (String) children.get(0);
|
||||||
at = (PointNode) find("at");
|
at = (PointNode) find("at");
|
||||||
size = (SizeNode) find("size");
|
size = (SizeNode) find("size");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isConnected(PointNode point) {
|
public boolean isConnected(PointNode point) {
|
||||||
return point.isConnected(at, size);
|
return point.isConnected(at, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static PcbNode parse(String nodeName, int i, List<Object> children) {
|
public static PcbNode parse(String nodeName, int i, List<Object> children) {
|
||||||
Object shape = children.get(2);
|
Object shape = children.get(2);
|
||||||
if ("rect".equals(shape))
|
if ("rect".equals(shape))
|
||||||
return new RectPadNode(nodeName, i, children);
|
return new RectPadNode(nodeName, i, children);
|
||||||
if ("circle".equals(shape))
|
if ("circle".equals(shape))
|
||||||
return new CirclePadNode(nodeName, i, children);
|
return new CirclePadNode(nodeName, i, children);
|
||||||
throw new IllegalStateException(shape.toString());
|
if ("oval".equals(shape))
|
||||||
}
|
return new CirclePadNode(nodeName, i, children); // yes, let's treat oval as circle. good enough
|
||||||
|
throw new IllegalStateException("Unknown pad shape: " + shape.toString());
|
||||||
@Override
|
}
|
||||||
public String toString() {
|
|
||||||
return "PadNode{" +
|
@Override
|
||||||
"at=" + at +
|
public String toString() {
|
||||||
", size=" + size +
|
return "PadNode{" +
|
||||||
'}';
|
"at=" + at +
|
||||||
}
|
", size=" + size +
|
||||||
}
|
'}';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,214 +1,260 @@
|
||||||
package com.rusefi.pcb;
|
package com.rusefi.pcb;
|
||||||
|
|
||||||
import com.rusefi.PcbCopyTool;
|
import com.rusefi.PcbCopyTool;
|
||||||
import com.rusefi.misc.NameAndOffset;
|
import com.rusefi.misc.NameAndOffset;
|
||||||
import com.rusefi.misc.ChangesModel;
|
import com.rusefi.misc.ChangesModel;
|
||||||
import com.rusefi.misc.RemoveUnneededTraces;
|
import com.rusefi.misc.RemoveUnneededTraces;
|
||||||
import com.rusefi.misc.TwoFileRequest;
|
import com.rusefi.misc.TwoFileRequest;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 12/16/13.
|
* 12/16/13.
|
||||||
*/
|
*/
|
||||||
public class PcbMergeTool {
|
public class PcbMergeTool {
|
||||||
private static Networks networks = new Networks();
|
private static Networks networks = new Networks();
|
||||||
|
|
||||||
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 parameters expected: SOURCE_PCB_FILENAME DESTINATION_PCB_FILENAME CHANGES_LIST_FILENAME");
|
System.out.println("Three parameters expected: SOURCE_PCB_FILENAME DESTINATION_PCB_FILENAME CHANGES_LIST_FILENAME");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
String sourcePcb = args[0];
|
String sourcePcb = args[0];
|
||||||
String destination = args[1];
|
String destination = args[1];
|
||||||
String changes = args[2];
|
String changes = args[2];
|
||||||
|
|
||||||
ChangesModel.readConfiguration(changes);
|
ChangesModel.readConfiguration(changes);
|
||||||
|
|
||||||
log("Running COPY commands");
|
log("Running COPY commands");
|
||||||
for (TwoFileRequest or : ChangesModel.getInstance().COPY_REQUESTS)
|
for (TwoFileRequest or : ChangesModel.getInstance().COPY_REQUESTS)
|
||||||
PcbCopyTool.copy(or.input, or.output);
|
PcbCopyTool.copy(or.input, or.output);
|
||||||
|
|
||||||
log("Running OPTIMIZE commands");
|
log("Running OPTIMIZE commands");
|
||||||
for (TwoFileRequest or : ChangesModel.getInstance().OPTIMIZE_REQUESTS)
|
for (TwoFileRequest or : ChangesModel.getInstance().OPTIMIZE_REQUESTS)
|
||||||
RemoveUnneededTraces.optimize(or.input, or.output);
|
RemoveUnneededTraces.optimize(or.input, or.output);
|
||||||
|
|
||||||
PcbNode destNode = PcbNode.readFromFile(sourcePcb);
|
PcbNode destNode = PcbNode.readFromFile(sourcePcb);
|
||||||
|
|
||||||
log("Running ADD commands");
|
|
||||||
for (NameAndOffset addRequest : ChangesModel.getInstance().ADD_REQUESTS) {
|
for (PcbNode net : destNode.iterate("net")) {
|
||||||
PcbNode node = PcbMoveTool.readAndMove(addRequest.getName(), addRequest.x, addRequest.y);
|
String netName = net.getChild(1); // todo: nicer method?
|
||||||
|
if (!Networks.isLocalNetwork(netName))
|
||||||
mergePcb(destNode, node);
|
networks.registerNetworkIfPcbSpecific(netName);
|
||||||
}
|
}
|
||||||
|
|
||||||
log("Running MOVE commands");
|
log("Running ADD commands");
|
||||||
for (NameAndOffset moveRequest : ChangesModel.getInstance().MOVE_REQUESTS) {
|
for (NameAndOffset addRequest : ChangesModel.getInstance().ADD_REQUESTS) {
|
||||||
String moduleName = moveRequest.getName();
|
PcbNode node = PcbMoveTool.readAndMove(addRequest.getName(), addRequest.x, addRequest.y);
|
||||||
ModuleNode module = findModuleByName(destNode, moduleName);
|
|
||||||
if (module == null) {
|
mergePcb(destNode, node);
|
||||||
log("Module not found: " + moduleName);
|
}
|
||||||
continue;
|
|
||||||
}
|
log("Running MOVE commands");
|
||||||
|
for (NameAndOffset moveRequest : ChangesModel.getInstance().MOVE_REQUESTS) {
|
||||||
PointNode at = module.at;
|
String moduleName = moveRequest.getName();
|
||||||
at.setLocation(at.x + moveRequest.x, at.y + moveRequest.y);
|
ModuleNode module = findModuleByName(destNode, moduleName);
|
||||||
}
|
if (module == null) {
|
||||||
|
log("Module not found: " + moduleName);
|
||||||
removeNodes(destNode);
|
continue;
|
||||||
|
}
|
||||||
destNode.write(destination);
|
|
||||||
|
PointNode at = module.at;
|
||||||
RemoveUnneededTraces.optimize(destination, destination);
|
at.setLocation(at.x + moveRequest.x, at.y + moveRequest.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ModuleNode findModuleByName(PcbNode destNode, String moduleName) {
|
removeNodes(destNode);
|
||||||
for (PcbNode node : destNode.iterate("module")) {
|
|
||||||
ModuleNode mn = (ModuleNode) node;
|
destNode.write(destination);
|
||||||
if (moduleName.toLowerCase().equals(mn.name.toLowerCase()))
|
|
||||||
return mn;
|
RemoveUnneededTraces.optimize(destination, destination);
|
||||||
}
|
}
|
||||||
return null;
|
|
||||||
}
|
private static ModuleNode findModuleByName(PcbNode destNode, String moduleName) {
|
||||||
|
for (PcbNode node : destNode.iterate("module")) {
|
||||||
private static void mergePcb(PcbNode destNode, PcbNode source) throws IOException {
|
ModuleNode mn = (ModuleNode) node;
|
||||||
Map<String, String> netNameMapping = new HashMap<String, String>();
|
if (moduleName.toLowerCase().equals(mn.getReference().toLowerCase()))
|
||||||
Map<String, Integer> netIdMapping = new HashMap<String, Integer>();
|
return mn;
|
||||||
|
}
|
||||||
for (PcbNode net : source.iterate("net")) {
|
return null;
|
||||||
String netId = net.getChild(0);
|
}
|
||||||
String netName = net.getChild(1);
|
|
||||||
String newName = networks.registerNetworkIfPcbSpecific(netName);
|
private static void mergePcb(PcbNode destNode, PcbNode source) throws IOException {
|
||||||
netNameMapping.put(netName, newName);
|
/**
|
||||||
netIdMapping.put(netId, networks.getId(newName));
|
* original local net name > new net name in combined PCB
|
||||||
}
|
*/
|
||||||
|
Map<String, String> netNameMapping = new HashMap<>();
|
||||||
List<PcbNode> zones = source.iterate("zone");
|
/**
|
||||||
log("Processing " + zones.size() + " zone(s)");
|
* original local net ID (as string) > new net ID
|
||||||
for (PcbNode z : zones) {
|
*/
|
||||||
ZoneNode zone = (ZoneNode) z;
|
Map<String, Integer> netIdMapping = new HashMap<>();
|
||||||
if (zone.getLayerNode().isSikscreenLayer())
|
|
||||||
destNode.addChild(zone);
|
for (PcbNode net : source.iterate("net")) {
|
||||||
}
|
String netId = net.getChild(0);
|
||||||
|
String netName = net.getChild(1); // todo: nicer method?
|
||||||
List<PcbNode> arcs = source.iterate("gr_arc");
|
String newName = networks.registerNetworkIfPcbSpecific(netName);
|
||||||
log("Processing " + arcs.size() + " arc(s)");
|
netNameMapping.put(netName, newName);
|
||||||
for (PcbNode arc : arcs)
|
netIdMapping.put(netId, networks.getId(newName));
|
||||||
destNode.addChild(arc);
|
}
|
||||||
|
|
||||||
|
List<PcbNode> zones = source.iterate("zone");
|
||||||
List<PcbNode> lines = source.iterate("gr_line");
|
log("Processing " + zones.size() + " zone(s)");
|
||||||
log("Processing " + lines.size() + " line(s)");
|
for (PcbNode z : zones) {
|
||||||
for (PcbNode l : lines) {
|
ZoneNode zone = (ZoneNode) z;
|
||||||
GrLineNode line = (GrLineNode) l;
|
if (zone.getLayerNode().isSikscreenLayer())
|
||||||
if (line.layerNode.isSikscreenLayer())
|
destNode.addChild(zone);
|
||||||
destNode.addChild(line);
|
}
|
||||||
}
|
|
||||||
|
List<PcbNode> arcs = source.iterate("gr_arc");
|
||||||
|
log("Processing " + arcs.size() + " arc(s)");
|
||||||
List<PcbNode> labels = source.iterate("gr_text");
|
for (PcbNode arc : arcs)
|
||||||
log("Processing " + labels.size() + " label(s)");
|
destNode.addChild(arc);
|
||||||
for (PcbNode label : labels) {
|
|
||||||
destNode.addChild(label);
|
|
||||||
}
|
List<PcbNode> lines = source.iterate("gr_line");
|
||||||
|
log("Processing " + lines.size() + " line(s)");
|
||||||
List<PcbNode> modules = source.iterate("module");
|
for (PcbNode l : lines) {
|
||||||
log("Processing " + modules.size() + " module(s)");
|
GrLineNode line = (GrLineNode) l;
|
||||||
for (PcbNode module : modules) {
|
if (line.layerNode.isSikscreenLayer())
|
||||||
for (PcbNode pad : module.iterate("pad")) {
|
destNode.addChild(line);
|
||||||
if (!pad.hasChild("net"))
|
}
|
||||||
continue;
|
|
||||||
PcbNode net = pad.find("net");
|
|
||||||
String localName = netNameMapping.get(net.getChild(1));
|
List<PcbNode> labels = source.iterate("gr_text");
|
||||||
net.setString(1, localName);
|
log("Processing " + labels.size() + " label(s)");
|
||||||
net.setInt(0, networks.getId(localName));
|
for (PcbNode label : labels) {
|
||||||
}
|
destNode.addChild(label);
|
||||||
destNode.addChild(module);
|
}
|
||||||
}
|
|
||||||
|
List<PcbNode> modules = source.iterate("module");
|
||||||
List<PcbNode> segments = source.iterate("segment");
|
log("Processing " + modules.size() + " module(s)");
|
||||||
log("Processing " + segments.size() + " segments");
|
for (PcbNode module : modules) {
|
||||||
for (PcbNode segment : segments) {
|
for (PcbNode pad : module.iterate("pad")) {
|
||||||
// if (!segment.hasChild("net"))
|
if (!pad.hasChild("net"))
|
||||||
// continue;
|
continue;
|
||||||
fixNetId(netIdMapping, segment);
|
fixNetId(netIdMapping, netNameMapping, pad);
|
||||||
|
// PcbNode net = pad.find("net");
|
||||||
destNode.addChild(segment);
|
// String localName = netNameMapping.get(net.getChild(1));
|
||||||
}
|
// net.setString(1, localName);
|
||||||
|
// net.setInt(0, networks.getId(localName));
|
||||||
List<PcbNode> vias = source.iterate("via");
|
}
|
||||||
log("Processing " + vias.size() + " vias");
|
destNode.addChild(module);
|
||||||
for (PcbNode via : vias) {
|
}
|
||||||
fixNetId(netIdMapping, via);
|
|
||||||
|
List<PcbNode> segments = source.iterate("segment");
|
||||||
destNode.addChild(via);
|
log("Processing " + segments.size() + " segments");
|
||||||
}
|
for (PcbNode segment : segments) {
|
||||||
|
// if (!segment.hasChild("net"))
|
||||||
// for (PcbNode zone : source.iterate("zone")) {
|
// continue;
|
||||||
// fixNetId(netIdMapping, zone);
|
fixNetId(netIdMapping, netNameMapping, segment);
|
||||||
// destNode.addChild(zone);
|
|
||||||
// }
|
destNode.addChild(segment);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void removeNodes(PcbNode source) {
|
List<PcbNode> vias = source.iterate("via");
|
||||||
for (PcbNode module : source.iterate("module")) {
|
log("Processing " + vias.size() + " vias");
|
||||||
if (shouldRemove((ModuleNode) module))
|
for (PcbNode via : vias) {
|
||||||
source.removeChild(module);
|
fixNetId(netIdMapping, netNameMapping, via);
|
||||||
}
|
|
||||||
}
|
destNode.addChild(via);
|
||||||
|
}
|
||||||
private static boolean shouldRemove(ModuleNode module) {
|
|
||||||
for (PcbNode fp_text : module.iterate("fp_text")) {
|
// for (PcbNode zone : source.iterate("zone")) {
|
||||||
if ("reference".equals(fp_text.getChild(0))) {
|
// fixNetId(netIdMapping, zone);
|
||||||
String name = fp_text.getChild(1);
|
// destNode.addChild(zone);
|
||||||
if (ChangesModel.getInstance().DEL_REQUESTS.contains(name))
|
// }
|
||||||
return true;
|
}
|
||||||
}
|
|
||||||
}
|
public static void removeNodes(PcbNode source) {
|
||||||
return false;
|
for (PcbNode module : source.iterate("module")) {
|
||||||
}
|
if (shouldRemove((ModuleNode) module))
|
||||||
|
source.removeChild(module);
|
||||||
private static void fixNetId(Map<String, Integer> netIdMapping, PcbNode via) {
|
}
|
||||||
PcbNode net = via.find("net");
|
}
|
||||||
String originalId = net.getChild(0);
|
|
||||||
net.setInt(0, netIdMapping.get(originalId));
|
private static boolean shouldRemove(ModuleNode module) {
|
||||||
}
|
for (PcbNode fp_text : module.iterate("fp_text")) {
|
||||||
|
if ("reference".equals(fp_text.getChild(0))) {
|
||||||
private static class Networks {
|
String name = fp_text.getChild(1);
|
||||||
private Map<String, Integer> networks = new HashMap<String, Integer>();
|
if (ChangesModel.getInstance().DEL_REQUESTS.contains(name))
|
||||||
|
return true;
|
||||||
public String registerNetworkIfPcbSpecific(String name) {
|
}
|
||||||
if (name.startsWith("N-00")) {
|
}
|
||||||
String newName = "F-0000" + networks.size();
|
return false;
|
||||||
log("Board-specific net: " + name + " would be " + newName);
|
}
|
||||||
|
|
||||||
networks.put(newName, networks.size());
|
private static void fixNetId(Map<String, Integer> netIdMapping, Map<String, String> netNameMapping, PcbNode node) {
|
||||||
return newName;
|
NetNode net = (NetNode) node.find("net");
|
||||||
} else {
|
String originalId = net.id;
|
||||||
if (networks.containsKey(name)) {
|
Integer currentNetId = netIdMapping.get(originalId);
|
||||||
log("Existing global net: " + name);
|
String globalName = networks.nameById.get(currentNetId);
|
||||||
return name;
|
// String newName = netNameMapping.get(originalName);
|
||||||
}
|
// if (newName == null)
|
||||||
|
// throw new NullPointerException("?");
|
||||||
log("New global net: " + name);
|
|
||||||
networks.put(name, networks.size());
|
if (ChangesModel.getInstance().NET_MERGE_REQUESTS.containsKey(globalName)) {
|
||||||
return name;
|
String newName = ChangesModel.getInstance().NET_MERGE_REQUESTS.get(globalName);
|
||||||
}
|
log("Will merge " + globalName + " into " + newName + ". ID was " + currentNetId);
|
||||||
}
|
currentNetId = networks.networks.get(newName);
|
||||||
|
if (currentNetId == null)
|
||||||
public int getId(String localName) {
|
throw new NullPointerException("Cannot find net: " + newName);
|
||||||
Integer value = networks.get(localName);
|
log("New ID: " + currentNetId);
|
||||||
if (value == null)
|
globalName = newName;
|
||||||
throw new NullPointerException("No id for " + localName);
|
}
|
||||||
return value;
|
net.setInt(0, currentNetId);
|
||||||
}
|
if (net.name != null)
|
||||||
}
|
net.setString(1, globalName);
|
||||||
|
}
|
||||||
public static void log(String s) {
|
|
||||||
System.out.println(s);
|
private static class Networks {
|
||||||
}
|
/**
|
||||||
}
|
* Net name > Net Id
|
||||||
|
*/
|
||||||
|
private Map<String, Integer> networks = new HashMap<>();
|
||||||
|
private Map<Integer, String> nameById = new HashMap<>();
|
||||||
|
|
||||||
|
public String registerNetworkIfPcbSpecific(String name) {
|
||||||
|
if (isLocalNetwork(name)) {
|
||||||
|
String newName = "F-0000" + networks.size();
|
||||||
|
log("Board-specific net: " + name + " would be " + newName);
|
||||||
|
|
||||||
|
registerNet(newName);
|
||||||
|
int newId = networks.get(newName);
|
||||||
|
log(newName + " is " + newId);
|
||||||
|
return newName;
|
||||||
|
} else {
|
||||||
|
if (networks.containsKey(name)) {
|
||||||
|
log("Existing global net: " + name);
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
log("New global net: " + name);
|
||||||
|
registerNet(name);
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isLocalNetwork(String name) {
|
||||||
|
return name.startsWith("N-00");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void registerNet(String name) {
|
||||||
|
networks.put(name, networks.size());
|
||||||
|
nameById.put(networks.get(name), name);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getId(String localName) {
|
||||||
|
Integer value = networks.get(localName);
|
||||||
|
if (value == null)
|
||||||
|
throw new NullPointerException("No id for " + localName);
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void log(String s) {
|
||||||
|
System.out.println(s);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,127 +1,137 @@
|
||||||
package com.rusefi.pcb;
|
package com.rusefi.pcb;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 12/8/13
|
* 12/8/13
|
||||||
*/
|
*/
|
||||||
public class PcbMoveTool {
|
public class PcbMoveTool {
|
||||||
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("Four parameters expected: SRC_FILENAME DST_FILENAME X Y");
|
System.out.println("Four parameters expected: SRC_FILENAME DST_FILENAME X Y");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
String srcFileName = args[0];
|
String srcFileName = args[0];
|
||||||
String dstFileName = args[1];
|
String dstFileName = args[1];
|
||||||
double x = Double.parseDouble(args[2]);
|
double x = Double.parseDouble(args[2]);
|
||||||
double y = Double.parseDouble(args[3]);
|
double y = Double.parseDouble(args[3]);
|
||||||
|
|
||||||
PcbNode node = readAndMove(srcFileName, x, y);
|
PcbNode node = readAndMove(srcFileName, x, y);
|
||||||
node.write(dstFileName);
|
node.write(dstFileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static PcbNode readAndMove(String fileName, double x, double y) throws IOException {
|
public static PcbNode readAndMove(String fileName, double x, double y) throws IOException {
|
||||||
PcbNode node = PcbNode.readFromFile(fileName);
|
PcbNode node = PcbNode.readFromFile(fileName);
|
||||||
|
|
||||||
move(node, x, y);
|
move(node, x, y);
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void move(PcbNode pcbNode, double dx, double dy) {
|
public static void move(PcbNode pcbNode, double dx, double dy) {
|
||||||
System.out.println("Moving " + pcbNode + ": dx=" +dx + " dy=" + dy);
|
System.out.println("Moving " + pcbNode + ": dx=" +dx + " dy=" + dy);
|
||||||
|
|
||||||
List<PcbNode> dimensions = pcbNode.iterate("dimension");
|
List<PcbNode> dimensions = pcbNode.iterate("dimension");
|
||||||
System.out.println("Moving " + dimensions.size() + " dimension");
|
System.out.println("Moving " + dimensions.size() + " dimension");
|
||||||
for (PcbNode dimension : dimensions) {
|
for (PcbNode dimension : dimensions) {
|
||||||
moveAt(dx, dy, dimension.find("gr_text"));
|
moveAt(dx, dy, dimension.find("gr_text"));
|
||||||
movePts(dx, dy, dimension.find("feature1"));
|
movePts(dx, dy, dimension.find("feature1"));
|
||||||
movePts(dx, dy, dimension.find("feature2"));
|
movePts(dx, dy, dimension.find("feature2"));
|
||||||
movePts(dx, dy, dimension.find("crossbar"));
|
movePts(dx, dy, dimension.find("crossbar"));
|
||||||
movePts(dx, dy, dimension.find("arrow1a"));
|
movePts(dx, dy, dimension.find("arrow1a"));
|
||||||
movePts(dx, dy, dimension.find("arrow1b"));
|
movePts(dx, dy, dimension.find("arrow1b"));
|
||||||
movePts(dx, dy, dimension.find("arrow2a"));
|
movePts(dx, dy, dimension.find("arrow2a"));
|
||||||
movePts(dx, dy, dimension.find("arrow2b"));
|
movePts(dx, dy, dimension.find("arrow2b"));
|
||||||
}
|
}
|
||||||
|
|
||||||
List<PcbNode> gr_lines = pcbNode.iterate("gr_line");
|
List<PcbNode> gr_lines = pcbNode.iterate("gr_line");
|
||||||
System.out.println("Moving " + gr_lines.size() + " gr_lines");
|
System.out.println("Moving " + gr_lines.size() + " gr_lines");
|
||||||
for (PcbNode gr_line : gr_lines)
|
for (PcbNode gr_line : gr_lines)
|
||||||
moveStartEnd(dx, dy, gr_line);
|
moveStartEnd(dx, dy, gr_line);
|
||||||
|
|
||||||
List<PcbNode> gr_circles = pcbNode.iterate("gr_circle");
|
List<PcbNode> gr_arcs = pcbNode.iterate("gr_arc");
|
||||||
System.out.println("Moving " + gr_circles.size() + " gr_circles");
|
System.out.println("Moving " + gr_arcs.size() + " gr_arcs");
|
||||||
for (PcbNode gr_circle : gr_circles) {
|
for (PcbNode gr_arc : gr_arcs) {
|
||||||
PcbNode start = gr_circle.find("center");
|
PcbNode start = gr_arc.find("start");
|
||||||
moveCoordinatesInFirstChildren(dx, dy, start);
|
moveCoordinatesInFirstChildren(dx, dy, start);
|
||||||
|
|
||||||
PcbNode end = gr_circle.find("end");
|
PcbNode end = gr_arc.find("end");
|
||||||
moveCoordinatesInFirstChildren(dx, dy, end);
|
moveCoordinatesInFirstChildren(dx, dy, end);
|
||||||
}
|
}
|
||||||
|
|
||||||
List<PcbNode> gr_texts = pcbNode.iterate("gr_text");
|
List<PcbNode> gr_circles = pcbNode.iterate("gr_circle");
|
||||||
System.out.println("Moving " + gr_texts.size() + " gr_texts");
|
System.out.println("Moving " + gr_circles.size() + " gr_circles");
|
||||||
for (PcbNode gr_text : gr_texts)
|
for (PcbNode gr_circle : gr_circles) {
|
||||||
moveAt(dx, dy, gr_text);
|
PcbNode start = gr_circle.find("center");
|
||||||
|
moveCoordinatesInFirstChildren(dx, dy, start);
|
||||||
List<PcbNode> zones = pcbNode.iterate("zone");
|
|
||||||
System.out.println("Moving " + zones.size() + " zones");
|
PcbNode end = gr_circle.find("end");
|
||||||
for (PcbNode zone : zones) {
|
moveCoordinatesInFirstChildren(dx, dy, end);
|
||||||
List<PcbNode> filledPolygons = zone.iterate("filled_polygon");
|
}
|
||||||
for (PcbNode filledPolygon : filledPolygons)
|
|
||||||
movePts(dx, dy, filledPolygon);
|
List<PcbNode> gr_texts = pcbNode.iterate("gr_text");
|
||||||
List<PcbNode> polygons = zone.iterate("polygon");
|
System.out.println("Moving " + gr_texts.size() + " gr_texts");
|
||||||
for (PcbNode polygon : polygons)
|
for (PcbNode gr_text : gr_texts)
|
||||||
movePts(dx, dy, polygon);
|
moveAt(dx, dy, gr_text);
|
||||||
}
|
|
||||||
|
List<PcbNode> zones = pcbNode.iterate("zone");
|
||||||
|
System.out.println("Moving " + zones.size() + " zones");
|
||||||
List<PcbNode> segments = pcbNode.iterate("segment");
|
for (PcbNode zone : zones) {
|
||||||
System.out.println("Moving " + segments.size() + " segments");
|
List<PcbNode> filledPolygons = zone.iterate("filled_polygon");
|
||||||
for (PcbNode segment : segments)
|
for (PcbNode filledPolygon : filledPolygons)
|
||||||
moveStartEnd(dx, dy, segment);
|
movePts(dx, dy, filledPolygon);
|
||||||
|
List<PcbNode> polygons = zone.iterate("polygon");
|
||||||
List<PcbNode> vias = pcbNode.iterate("via");
|
for (PcbNode polygon : polygons)
|
||||||
System.out.println("Moving " + vias.size() + " vias");
|
movePts(dx, dy, polygon);
|
||||||
for (PcbNode via : vias)
|
}
|
||||||
moveAt(dx, dy, via);
|
|
||||||
|
|
||||||
|
List<PcbNode> segments = pcbNode.iterate("segment");
|
||||||
List<PcbNode> modules = pcbNode.iterate("module");
|
System.out.println("Moving " + segments.size() + " segments");
|
||||||
System.out.println("Moving " + modules.size() + " modules");
|
for (PcbNode segment : segments)
|
||||||
for (PcbNode module : modules)
|
moveStartEnd(dx, dy, segment);
|
||||||
moveAt(dx, dy, module);
|
|
||||||
}
|
List<PcbNode> vias = pcbNode.iterate("via");
|
||||||
|
System.out.println("Moving " + vias.size() + " vias");
|
||||||
public static void movePts(double dx, double dy, PcbNode polygon) {
|
for (PcbNode via : vias)
|
||||||
PcbNode pts = polygon.find("pts");
|
moveAt(dx, dy, via);
|
||||||
|
|
||||||
for (PcbNode point : pts.nodes())
|
|
||||||
moveCoordinatesInFirstChildren(dx, dy, point);
|
List<PcbNode> modules = pcbNode.iterate("module");
|
||||||
}
|
System.out.println("Moving " + modules.size() + " modules");
|
||||||
|
for (PcbNode module : modules)
|
||||||
public static void moveStartEnd(double dx, double dy, PcbNode segment) {
|
moveAt(dx, dy, module);
|
||||||
PcbNode start = segment.find("start");
|
}
|
||||||
moveCoordinatesInFirstChildren(dx, dy, start);
|
|
||||||
|
public static void movePts(double dx, double dy, PcbNode polygon) {
|
||||||
PcbNode end = segment.find("end");
|
PcbNode pts = polygon.find("pts");
|
||||||
moveCoordinatesInFirstChildren(dx, dy, end);
|
|
||||||
}
|
for (PcbNode point : pts.nodes())
|
||||||
|
moveCoordinatesInFirstChildren(dx, dy, point);
|
||||||
public static void moveAt(double dx, double dy, PcbNode module) {
|
}
|
||||||
PcbNode at = module.find("at");
|
|
||||||
moveCoordinatesInFirstChildren(dx, dy, at);
|
public static void moveStartEnd(double dx, double dy, PcbNode segment) {
|
||||||
}
|
PcbNode start = segment.find("start");
|
||||||
|
moveCoordinatesInFirstChildren(dx, dy, start);
|
||||||
public static void moveCoordinatesInFirstChildren(double dx, double dy, PcbNode at) {
|
|
||||||
moveCoordinates(dx, dy, at, 0);
|
PcbNode end = segment.find("end");
|
||||||
}
|
moveCoordinatesInFirstChildren(dx, dy, end);
|
||||||
|
}
|
||||||
private static void moveCoordinates(double dx, double dy, PcbNode at, int index) {
|
|
||||||
double x = at.asDouble(index);
|
public static void moveAt(double dx, double dy, PcbNode module) {
|
||||||
double y = at.asDouble(index + 1);
|
PcbNode at = module.find("at");
|
||||||
at.setDouble(index, x + dx);
|
moveCoordinatesInFirstChildren(dx, dy, at);
|
||||||
at.setDouble(index + 1, y + dy);
|
}
|
||||||
}
|
|
||||||
}
|
public static void moveCoordinatesInFirstChildren(double dx, double dy, PcbNode at) {
|
||||||
|
moveCoordinates(dx, dy, at, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void moveCoordinates(double dx, double dy, PcbNode at, int index) {
|
||||||
|
double x = at.asDouble(index);
|
||||||
|
double y = at.asDouble(index + 1);
|
||||||
|
at.setDouble(index, x + dx);
|
||||||
|
at.setDouble(index + 1, y + dy);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,243 +1,247 @@
|
||||||
package com.rusefi.pcb;
|
package com.rusefi.pcb;
|
||||||
|
|
||||||
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.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 12/8/13
|
* 12/8/13
|
||||||
*/
|
*/
|
||||||
public class PcbNode {
|
public class PcbNode {
|
||||||
public final String nodeName;
|
public final String nodeName;
|
||||||
public final int closingIndex;
|
public final int closingIndex;
|
||||||
public final List<Object> children;
|
public final List<Object> children;
|
||||||
|
|
||||||
public PcbNode(String nodeName, int closingIndex, List<Object> children) {
|
public PcbNode(String nodeName, int closingIndex, List<Object> children) {
|
||||||
this.nodeName = nodeName;
|
this.nodeName = nodeName;
|
||||||
this.closingIndex = closingIndex;
|
this.closingIndex = closingIndex;
|
||||||
this.children = children;
|
this.children = children;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see #write
|
* @see #write
|
||||||
*/
|
*/
|
||||||
public static PcbNode readFromFile(String fileName) throws IOException {
|
public static PcbNode readFromFile(String fileName) throws IOException {
|
||||||
String content = FileUtils.readFile(fileName);
|
String content = FileUtils.readFile(fileName);
|
||||||
PcbNode node = parse(content);
|
PcbNode node = parse(content);
|
||||||
System.out.println("GND network: " + NetNode.GND_NET_ID);
|
System.out.println("GND network: " + NetNode.GND_NET_ID);
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "PcbNode{" +
|
return "PcbNode{" +
|
||||||
nodeName +
|
nodeName +
|
||||||
", children=" + children.size() +
|
", children=" + children.size() +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
|
|
||||||
private static PcbNode parse(String s, int index, int depth) {
|
private static PcbNode parse(String s, int index, int depth) {
|
||||||
log("Reading node from " + index, depth);
|
log("Reading node from " + index, depth);
|
||||||
if (s.charAt(index) != '(')
|
if (s.charAt(index) != '(')
|
||||||
throw new IllegalStateException("opening bracket expected");
|
throw new IllegalStateException("opening bracket expected");
|
||||||
index++;
|
index++;
|
||||||
String nodeName = readToken(s, index, depth);
|
String nodeName = readToken(s, index, depth);
|
||||||
index += nodeName.length();
|
index += nodeName.length();
|
||||||
|
|
||||||
List<Object> children = new ArrayList<Object>();
|
List<Object> children = new ArrayList<Object>();
|
||||||
while (true) {
|
while (true) {
|
||||||
while (isWhitespace(s.charAt(index)))
|
while (isWhitespace(s.charAt(index)))
|
||||||
index++;
|
index++;
|
||||||
|
|
||||||
char c = s.charAt(index);
|
char c = s.charAt(index);
|
||||||
if (c == ')')
|
if (c == ')')
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (s.charAt(index) == '(') {
|
if (s.charAt(index) == '(') {
|
||||||
PcbNode child = parse(s, index, depth + 1);
|
PcbNode child = parse(s, index, depth + 1);
|
||||||
children.add(child);
|
children.add(child);
|
||||||
index = child.closingIndex;
|
index = child.closingIndex;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
String child = readToken(s, index, depth);
|
String child = readToken(s, index, depth);
|
||||||
children.add(child);
|
children.add(child);
|
||||||
index += child.length();
|
index += child.length();
|
||||||
}
|
}
|
||||||
if ("segment".equals(nodeName)) {
|
if ("segment".equals(nodeName)) {
|
||||||
return new SegmentNode(nodeName, index + 1, children);
|
return new SegmentNode(nodeName, index + 1, children);
|
||||||
} else if ("pad".equals(nodeName)) {
|
} else if ("pad".equals(nodeName)) {
|
||||||
return PadNode.parse(nodeName, index + 1, children);
|
return PadNode.parse(nodeName, index + 1, children);
|
||||||
} else if ("net".equals(nodeName)) {
|
} else if ("net".equals(nodeName)) {
|
||||||
return new NetNode(nodeName, index + 1, children);
|
return new NetNode(nodeName, index + 1, children);
|
||||||
} else if ("gr_line".equals(nodeName)) {
|
} else if ("add_net".equals(nodeName)) {
|
||||||
return new GrLineNode(nodeName, index + 1, children);
|
return new AddNetNode(nodeName, index + 1, children);
|
||||||
} else if ("layer".equals(nodeName)) {
|
} else if ("gr_line".equals(nodeName)) {
|
||||||
return new LayerNode(nodeName, index + 1, children);
|
return new GrLineNode(nodeName, index + 1, children);
|
||||||
} else if ("module".equals(nodeName)) {
|
} else if ("layer".equals(nodeName)) {
|
||||||
return new ModuleNode(nodeName, index + 1, children);
|
return new LayerNode(nodeName, index + 1, children);
|
||||||
} else if ("size".equals(nodeName) || "width".equals(nodeName)) {
|
} else if ("module".equals(nodeName)) {
|
||||||
return new SizeNode(nodeName, index + 1, children);
|
return new ModuleNode(nodeName, index + 1, children);
|
||||||
} else if ("zone".equals(nodeName)) {
|
} else if ("size".equals(nodeName) || "width".equals(nodeName)) {
|
||||||
return new ZoneNode(nodeName, index + 1, children);
|
return new SizeNode(nodeName, index + 1, children);
|
||||||
} else if ("via".equals(nodeName)) {
|
} else if ("zone".equals(nodeName)) {
|
||||||
return new ViaNode(nodeName, index + 1, children);
|
return new ZoneNode(nodeName, index + 1, children);
|
||||||
} else if ("start".equals(nodeName) || "end".equals(nodeName) || "at".equals(nodeName)) {
|
} else if ("via".equals(nodeName)) {
|
||||||
return new PointNode(nodeName, index + 1, children);
|
return new ViaNode(nodeName, index + 1, children);
|
||||||
}
|
} else if ("start".equals(nodeName) || "end".equals(nodeName) || "at".equals(nodeName)) {
|
||||||
|
return new PointNode(nodeName, index + 1, children);
|
||||||
return new PcbNode(nodeName, index + 1, children);
|
}
|
||||||
}
|
|
||||||
|
return new PcbNode(nodeName, index + 1, children);
|
||||||
private static String readToken(String s, int index, int depth) {
|
}
|
||||||
log("Reading token from " + index, depth);
|
|
||||||
if (s.charAt(index) == '"') {
|
private static String readToken(String s, int index, int depth) {
|
||||||
String result = s.substring(index, s.indexOf('"', index + 1) + 1);
|
log("Reading token from " + index, depth);
|
||||||
log("Got quoted token: " + result, depth);
|
if (s.charAt(index) == '"') {
|
||||||
return result;
|
String result = s.substring(index, s.indexOf('"', index + 1) + 1);
|
||||||
}
|
log("Got quoted token: " + result, depth);
|
||||||
|
return result;
|
||||||
String result = "";
|
}
|
||||||
while (index < s.length()) {
|
|
||||||
char c = s.charAt(index);
|
String result = "";
|
||||||
if (c == ')' || isWhitespace(c))
|
while (index < s.length()) {
|
||||||
break;
|
char c = s.charAt(index);
|
||||||
result += c;
|
if (c == ')' || isWhitespace(c))
|
||||||
index++;
|
break;
|
||||||
}
|
result += c;
|
||||||
if (result.length() == 0)
|
index++;
|
||||||
throw new IllegalStateException("Empty token");
|
}
|
||||||
log("Got token: " + result, depth);
|
if (result.length() == 0)
|
||||||
return result;
|
throw new IllegalStateException("Empty token");
|
||||||
}
|
log("Got token: " + result, depth);
|
||||||
|
return result;
|
||||||
private static void log(String s, int depth) {
|
}
|
||||||
// for (int i = 0; i < depth; i++)
|
|
||||||
// System.out.print(' ');
|
private static void log(String s, int depth) {
|
||||||
// System.out.println(s);
|
// for (int i = 0; i < depth; i++)
|
||||||
}
|
// System.out.print(' ');
|
||||||
|
// System.out.println(s);
|
||||||
private static void log(String s) {
|
}
|
||||||
log(s, 0);
|
|
||||||
}
|
private static void log(String s) {
|
||||||
|
log(s, 0);
|
||||||
private static boolean isWhitespace(char c) {
|
}
|
||||||
return c == ' ' || c == '\r' || c == '\n';
|
|
||||||
}
|
private static boolean isWhitespace(char c) {
|
||||||
|
return c == ' ' || c == '\r' || c == '\n';
|
||||||
public static PcbNode parse(String content) {
|
}
|
||||||
return parse(content, 0, 0);
|
|
||||||
}
|
public static PcbNode parse(String content) {
|
||||||
|
return parse(content, 0, 0);
|
||||||
public String pack() {
|
}
|
||||||
StringBuilder sb = new StringBuilder();
|
|
||||||
pack(sb, "");
|
public String pack() {
|
||||||
return sb.toString();
|
StringBuilder sb = new StringBuilder();
|
||||||
}
|
pack(sb, "");
|
||||||
|
return sb.toString();
|
||||||
private void pack(StringBuilder sb, String prefix) {
|
}
|
||||||
sb.append(prefix).append("(").append(nodeName);
|
|
||||||
|
private void pack(StringBuilder sb, String prefix) {
|
||||||
for (Object child : children) {
|
sb.append(prefix).append("(").append(nodeName);
|
||||||
if (child instanceof String) {
|
|
||||||
sb.append(" ").append(child);
|
for (Object child : children) {
|
||||||
continue;
|
if (child instanceof String) {
|
||||||
}
|
sb.append(" ").append(child);
|
||||||
PcbNode p = (PcbNode) child;
|
continue;
|
||||||
sb.append("\r\n");
|
}
|
||||||
p.pack(sb, prefix + " ");
|
PcbNode p = (PcbNode) child;
|
||||||
}
|
if (p == null)
|
||||||
|
throw new NullPointerException("Null child node");
|
||||||
|
sb.append("\r\n");
|
||||||
sb.append(")\r\n");
|
p.pack(sb, prefix + " ");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void write(String fileName) throws IOException {
|
|
||||||
System.out.println("Writing to " + fileName);
|
sb.append(")\r\n");
|
||||||
String content = pack();
|
}
|
||||||
BufferedWriter bw = new BufferedWriter(new FileWriter(fileName));
|
|
||||||
bw.write(content);
|
public void write(String fileName) throws IOException {
|
||||||
bw.close();
|
System.out.println("Writing to " + fileName);
|
||||||
}
|
String content = pack();
|
||||||
|
BufferedWriter bw = new BufferedWriter(new FileWriter(fileName));
|
||||||
public void setDouble(int i, double value) {
|
bw.write(content);
|
||||||
children.set(i, "" + value);
|
bw.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
public double asDouble(int index) {
|
public void setDouble(int i, double value) {
|
||||||
return Double.parseDouble((String) children.get(index));
|
children.set(i, "" + value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasChild(String key) {
|
public double asDouble(int index) {
|
||||||
return !iterate(key).isEmpty();
|
return Double.parseDouble((String) children.get(index));
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Nullable
|
public boolean hasChild(String key) {
|
||||||
public PcbNode findIfExists(String key) {
|
return !iterate(key).isEmpty();
|
||||||
List<PcbNode> r = iterate(key);
|
}
|
||||||
if (r.isEmpty())
|
|
||||||
return null;
|
// @Nullable
|
||||||
return find(key);
|
public PcbNode findIfExists(String key) {
|
||||||
}
|
List<PcbNode> r = iterate(key);
|
||||||
|
if (r.isEmpty())
|
||||||
// @NotNull
|
return null;
|
||||||
public PcbNode find(String key) {
|
return find(key);
|
||||||
List<PcbNode> r = iterate(key);
|
}
|
||||||
if (r.size() != 1)
|
|
||||||
throw new IllegalStateException("More that one " + key + " in " + nodeName);
|
// @NotNull
|
||||||
return r.get(0);
|
public PcbNode find(String key) {
|
||||||
}
|
List<PcbNode> r = iterate(key);
|
||||||
|
if (r.size() != 1)
|
||||||
public List<PcbNode> nodes() {
|
throw new IllegalStateException("More that one " + key + " in " + nodeName);
|
||||||
List<PcbNode> result = new ArrayList<PcbNode>();
|
return r.get(0);
|
||||||
for (Object child : children) {
|
}
|
||||||
if (child instanceof String)
|
|
||||||
continue;
|
public List<PcbNode> nodes() {
|
||||||
result.add((PcbNode) child);
|
List<PcbNode> result = new ArrayList<PcbNode>();
|
||||||
}
|
for (Object child : children) {
|
||||||
return result;
|
if (child instanceof String)
|
||||||
}
|
continue;
|
||||||
|
result.add((PcbNode) child);
|
||||||
public List<PcbNode> iterate(String key) {
|
}
|
||||||
List<PcbNode> result = new ArrayList<PcbNode>();
|
return result;
|
||||||
for (PcbNode p : nodes()) {
|
}
|
||||||
if (p.nodeName.equals(key))
|
|
||||||
result.add(p);
|
public List<PcbNode> iterate(String key) {
|
||||||
}
|
List<PcbNode> result = new ArrayList<PcbNode>();
|
||||||
return result;
|
for (PcbNode p : nodes()) {
|
||||||
}
|
if (p.nodeName.equals(key))
|
||||||
|
result.add(p);
|
||||||
public void addChild(PcbNode node) {
|
}
|
||||||
children.add(node);
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Object> getChildren() {
|
public void addChild(PcbNode node) {
|
||||||
return Collections.unmodifiableList(children);
|
children.add(node);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getChild(int index) {
|
public List<Object> getChildren() {
|
||||||
return (String) children.get(index);
|
return Collections.unmodifiableList(children);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setString(int index, String value) {
|
public String getChild(int index) {
|
||||||
children.set(index, value);
|
return (String) children.get(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setInt(int index, int value) {
|
public void setString(int index, String value) {
|
||||||
children.set(index, "" + value);
|
children.set(index, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean removeChild(Object child) {
|
public void setInt(int index, int value) {
|
||||||
return children.remove(child);
|
children.set(index, "" + value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isConnected(PointNode point) {
|
public boolean removeChild(Object child) {
|
||||||
return false;
|
return children.remove(child);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public boolean isConnected(PointNode point) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,76 +1,77 @@
|
||||||
package com.rusefi.pcb;
|
package com.rusefi.pcb;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Andrey Belomutskiy
|
* @author Andrey Belomutskiy
|
||||||
* 1/21/14
|
* 1/21/14
|
||||||
*/
|
*/
|
||||||
public class PointNode extends PcbNode {
|
public class PointNode extends PcbNode {
|
||||||
public final double x;
|
public final double x;
|
||||||
public final double y;
|
public final double y;
|
||||||
public final double angle;
|
public final double angle;
|
||||||
|
|
||||||
public PointNode(String nodeName, int i, List<Object> children) {
|
public PointNode(String nodeName, int i, List<Object> children) {
|
||||||
super(nodeName, i, children);
|
super(nodeName, i, children);
|
||||||
if (children.size() == 1) {
|
if (children.size() == 1) {
|
||||||
// xyz use-case
|
// xyz use-case
|
||||||
x = 0;
|
x = 0;
|
||||||
y = 0;
|
y = 0;
|
||||||
angle = 0;
|
angle = 0;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (children.size() != 2 && children.size() != 3)
|
if (children.size() != 2 && children.size() != 3)
|
||||||
throw new IllegalStateException("Unexpected children count");
|
throw new IllegalStateException("Unexpected children count");
|
||||||
x = Double.parseDouble((String) children.get(0));
|
x = Double.parseDouble((String) children.get(0));
|
||||||
y = Double.parseDouble((String) children.get(1));
|
y = Double.parseDouble((String) children.get(1));
|
||||||
angle = children.size() == 2 ? 0 : Double.parseDouble((String) children.get(2));
|
angle = children.size() == 2 ? 0 : Double.parseDouble((String) children.get(2));
|
||||||
}
|
}
|
||||||
|
|
||||||
public PointNode(double x, double y) {
|
public PointNode(double x, double y) {
|
||||||
super("", 0, Collections.emptyList());
|
this(x, y, 0);
|
||||||
this.x = x;
|
}
|
||||||
this.y = y;
|
|
||||||
angle = 0;
|
public PointNode(double x, double y, double angle) {
|
||||||
}
|
super("", 0, Collections.emptyList());
|
||||||
|
this.x = x;
|
||||||
public boolean isConnected(PointNode at, SizeNode size) {
|
this.y = y;
|
||||||
boolean isConnectedX = (x >= at.x - size.w / 2) && (x <= at.x + size.w / 2);
|
this.angle = angle;
|
||||||
boolean isConnectedY = (y >= at.y - size.h / 2) && (y <= at.y + size.h / 2);
|
}
|
||||||
return isConnectedX && isConnectedY;
|
|
||||||
}
|
public boolean isConnected(PointNode at, SizeNode size) {
|
||||||
|
boolean isConnectedX = (x >= at.x - size.w / 2) && (x <= at.x + size.w / 2);
|
||||||
@Override
|
boolean isConnectedY = (y >= at.y - size.h / 2) && (y <= at.y + size.h / 2);
|
||||||
public String toString() {
|
return isConnectedX && isConnectedY;
|
||||||
return "PointNode{" +
|
}
|
||||||
"x=" + x +
|
|
||||||
", y=" + y +
|
@Override
|
||||||
", angle=" + angle +
|
public String toString() {
|
||||||
'}';
|
return "PointNode{" +
|
||||||
}
|
"x=" + x +
|
||||||
|
", y=" + y +
|
||||||
public boolean isSameLocation(PointNode point) {
|
", angle=" + angle +
|
||||||
return x == point.x && y == point.y;
|
'}';
|
||||||
}
|
}
|
||||||
|
|
||||||
public PointNode translate(PointNode at) {
|
// public boolean isSameLocation(PointNode point) {
|
||||||
double nx = at.x - x;
|
// return x == point.x && y == point.y;
|
||||||
double ny = at.y - y;
|
// }
|
||||||
if (angle == 0)
|
|
||||||
return new PointNode(nx, ny);
|
public PointNode translate(PointNode at) {
|
||||||
if (angle == 270)
|
double nx = at.x - x;
|
||||||
return new PointNode(ny, -nx);
|
double ny = at.y - y;
|
||||||
if (angle == 90)
|
|
||||||
return new PointNode(-ny, nx);
|
double radian = angle / 180 * Math.PI;
|
||||||
if (angle == 180)
|
double rx = Math.cos(radian) * nx - Math.sin(radian) * ny;
|
||||||
return new PointNode(-nx, -ny);
|
double ry = Math.sin(radian) * nx + Math.cos(radian) * ny;
|
||||||
throw new IllegalStateException("Angle not supported: " + angle);
|
|
||||||
}
|
return new PointNode(rx, ry);
|
||||||
|
}
|
||||||
public void setLocation(double x, double y) {
|
|
||||||
children.set(0, Double.toString(x));
|
public void setLocation(double x, double y) {
|
||||||
children.set(1, Double.toString(y));
|
children.set(0, Double.toString(x));
|
||||||
}
|
children.set(1, Double.toString(y));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,22 @@
|
||||||
package com.rusefi.pcb;
|
package com.rusefi.pcb;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 1/21/14.
|
* 1/21/14.
|
||||||
*/
|
*/
|
||||||
public class RectPadNode extends PadNode {
|
public class RectPadNode extends PadNode {
|
||||||
public RectPadNode(String nodeName, int i, List<Object> children) {
|
public RectPadNode(String nodeName, int i, List<Object> children) {
|
||||||
super(nodeName, i, children);
|
super(nodeName, i, children);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "RectPadNode{" +
|
return "RectPadNode{" +
|
||||||
"name=" + name +
|
"name=" + name +
|
||||||
", at=" + at +
|
", at=" + at +
|
||||||
", size=" + size +
|
", size=" + size +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,35 +1,35 @@
|
||||||
package com.rusefi.pcb;
|
package com.rusefi.pcb;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Andrey Belomutskiy
|
* @author Andrey Belomutskiy
|
||||||
* 1/21/14
|
* 1/21/14
|
||||||
*/
|
*/
|
||||||
public class SegmentNode extends PcbNode {
|
public class SegmentNode extends PcbNode {
|
||||||
public final NetNode net;
|
public final NetNode net;
|
||||||
public final PointNode start;
|
public final PointNode start;
|
||||||
public final PointNode end;
|
public final PointNode end;
|
||||||
private final SizeNode size;
|
private final SizeNode size;
|
||||||
|
|
||||||
public SegmentNode(String nodeName, int closingIndex, List<Object> children) {
|
public SegmentNode(String nodeName, int closingIndex, List<Object> children) {
|
||||||
super(nodeName, closingIndex, children);
|
super(nodeName, closingIndex, children);
|
||||||
net = (NetNode) find("net");
|
net = (NetNode) find("net");
|
||||||
start = (PointNode) find("start");
|
start = (PointNode) find("start");
|
||||||
end = (PointNode) find("end");
|
end = (PointNode) find("end");
|
||||||
size = (SizeNode) find("width");
|
size = (SizeNode) find("width");
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isConnected(PointNode point) {
|
public boolean isConnected(PointNode point) {
|
||||||
return point.isConnected(start, size) || point.isConnected(end, size);
|
return point.isConnected(start, size) || point.isConnected(end, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "SegmentNode{" +
|
return "SegmentNode{" +
|
||||||
"net=" + net +
|
"net=" + net +
|
||||||
", start=" + start +
|
", start=" + start +
|
||||||
", end=" + end +
|
", end=" + end +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,33 +1,33 @@
|
||||||
package com.rusefi.pcb;
|
package com.rusefi.pcb;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Andrey Belomutskiy
|
* @author Andrey Belomutskiy
|
||||||
* 1/21/14
|
* 1/21/14
|
||||||
*/
|
*/
|
||||||
public class SizeNode extends PcbNode {
|
public class SizeNode extends PcbNode {
|
||||||
public final double w;
|
public final double w;
|
||||||
public final double h;
|
public final double h;
|
||||||
|
|
||||||
public SizeNode(String nodeName, int i, List<Object> children) {
|
public SizeNode(String nodeName, int i, List<Object> children) {
|
||||||
super(nodeName, i, children);
|
super(nodeName, i, children);
|
||||||
if (children.size() == 1) {
|
if (children.size() == 1) {
|
||||||
w = h = Double.parseDouble((String) children.get(0));
|
w = h = Double.parseDouble((String) children.get(0));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (children.size() != 2)
|
if (children.size() != 2)
|
||||||
throw new IllegalStateException("Size: " + children.size());
|
throw new IllegalStateException("Size: " + children.size());
|
||||||
w = Double.parseDouble((String) children.get(0));
|
w = Double.parseDouble((String) children.get(0));
|
||||||
h = Double.parseDouble((String) children.get(1));
|
h = Double.parseDouble((String) children.get(1));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "SizeNode{" +
|
return "SizeNode{" +
|
||||||
"w=" + w +
|
"w=" + w +
|
||||||
", h=" + h +
|
", h=" + h +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,32 +1,32 @@
|
||||||
package com.rusefi.pcb;
|
package com.rusefi.pcb;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Andrey Belomutskiy
|
* @author Andrey Belomutskiy
|
||||||
* 1/21/14
|
* 1/21/14
|
||||||
*/
|
*/
|
||||||
public class ViaNode extends PcbNode {
|
public class ViaNode extends PcbNode {
|
||||||
public final PointNode location;
|
public final PointNode location;
|
||||||
final SizeNode size;
|
final SizeNode size;
|
||||||
public final int netId;
|
public final int netId;
|
||||||
|
|
||||||
public ViaNode(String nodeName, int i, List<Object> children) {
|
public ViaNode(String nodeName, int i, List<Object> children) {
|
||||||
super(nodeName, i, children);
|
super(nodeName, i, children);
|
||||||
location = (PointNode) find("at");
|
location = (PointNode) find("at");
|
||||||
size = (SizeNode) find("size");
|
size = (SizeNode) find("size");
|
||||||
netId = Integer.parseInt(find("net").getChild(0));
|
netId = Integer.parseInt(find("net").getChild(0));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "ViaNode{" +
|
return "ViaNode{" +
|
||||||
"location=" + location +
|
"location=" + location +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isConnected(PointNode point) {
|
public boolean isConnected(PointNode point) {
|
||||||
return point.isConnected(location, size);
|
return point.isConnected(location, size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,20 @@
|
||||||
package com.rusefi.pcb;
|
package com.rusefi.pcb;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 2/11/14.
|
* 2/11/14.
|
||||||
*/
|
*/
|
||||||
public class ZoneNode extends PcbNode {
|
public class ZoneNode extends PcbNode {
|
||||||
private final LayerNode layerNode;
|
private final LayerNode layerNode;
|
||||||
|
|
||||||
public ZoneNode(String nodeName, int i, List<Object> children) {
|
public ZoneNode(String nodeName, int i, List<Object> children) {
|
||||||
super(nodeName, i, children);
|
super(nodeName, i, children);
|
||||||
layerNode = (LayerNode) find("layer");
|
layerNode = (LayerNode) find("layer");
|
||||||
}
|
}
|
||||||
|
|
||||||
public LayerNode getLayerNode() {
|
public LayerNode getLayerNode() {
|
||||||
return layerNode;
|
return layerNode;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,40 +1,40 @@
|
||||||
package com.rusefi.pcb.test;
|
package com.rusefi.pcb.test;
|
||||||
|
|
||||||
|
|
||||||
import com.rusefi.misc.NameAndOffset;
|
import com.rusefi.misc.NameAndOffset;
|
||||||
import com.rusefi.misc.ChangesModel;
|
import com.rusefi.misc.ChangesModel;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
import static junit.framework.Assert.assertEquals;
|
import static junit.framework.Assert.assertEquals;
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Andrey Belomutskiy
|
* @author Andrey Belomutskiy
|
||||||
* 1/24/14
|
* 1/24/14
|
||||||
*/
|
*/
|
||||||
public class ChangesModelTest {
|
public class ChangesModelTest {
|
||||||
@Test
|
@Test
|
||||||
public void testConfigParser() {
|
public void testConfigParser() {
|
||||||
|
|
||||||
ChangesModel model = ChangesModel.getInstance();
|
ChangesModel model = ChangesModel.getInstance();
|
||||||
model.clear();
|
model.clear();
|
||||||
|
|
||||||
model.read(Arrays.asList("reMove c1", "add mmc_usb_1.kicad_pcb",
|
model.read(Arrays.asList("reMove c1", "add mmc_usb_1.kicad_pcb",
|
||||||
"adD mmc_usb_1.kicad_pcb 4 6",
|
"adD mmc_usb_1.kicad_pcb 4 6",
|
||||||
"optimize mmc_usb_1.kicad_pcb out.x"));
|
"optimize mmc_usb_1.kicad_pcb out.x"));
|
||||||
|
|
||||||
assertEquals(1, model.DEL_REQUESTS.size());
|
assertEquals(1, model.DEL_REQUESTS.size());
|
||||||
assertTrue(model.DEL_REQUESTS.contains("C1"));
|
assertTrue(model.DEL_REQUESTS.contains("C1"));
|
||||||
|
|
||||||
assertEquals(2, model.ADD_REQUESTS.size());
|
assertEquals(2, model.ADD_REQUESTS.size());
|
||||||
|
|
||||||
NameAndOffset ar = model.ADD_REQUESTS.get(1);
|
NameAndOffset ar = model.ADD_REQUESTS.get(1);
|
||||||
Assert.assertEquals(4.0, ar.x, 0);
|
Assert.assertEquals(4.0, ar.x, 0);
|
||||||
Assert.assertEquals(6.0, ar.y, 0);
|
Assert.assertEquals(6.0, ar.y, 0);
|
||||||
|
|
||||||
assertEquals(1, model.OPTIMIZE_REQUESTS.size());
|
assertEquals(1, model.OPTIMIZE_REQUESTS.size());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,271 +1,271 @@
|
||||||
package com.rusefi.pcb.test;
|
package com.rusefi.pcb.test;
|
||||||
|
|
||||||
import com.rusefi.misc.RemoveUnneededTraces;
|
import com.rusefi.misc.RemoveUnneededTraces;
|
||||||
import com.rusefi.pcb.ModuleNode;
|
import com.rusefi.pcb.ModuleNode;
|
||||||
import com.rusefi.pcb.PcbNode;
|
import com.rusefi.pcb.PcbNode;
|
||||||
import com.rusefi.pcb.SegmentNode;
|
import com.rusefi.pcb.SegmentNode;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import static org.junit.Assert.assertFalse;
|
import static org.junit.Assert.assertFalse;
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
* 12/8/13
|
* 12/8/13
|
||||||
*/
|
*/
|
||||||
public class PcbNodeTest {
|
public class PcbNodeTest {
|
||||||
@Test
|
@Test
|
||||||
public void testParser() {
|
public void testParser() {
|
||||||
PcbNode n = PcbNode.parse("(version 3\r\n)");
|
PcbNode n = PcbNode.parse("(version 3\r\n)");
|
||||||
assertEquals("version", n.nodeName);
|
assertEquals("version", n.nodeName);
|
||||||
assertEquals(1, n.getChildren().size());
|
assertEquals(1, n.getChildren().size());
|
||||||
|
|
||||||
assertEquals("(version 3)\r\n", n.pack());
|
assertEquals("(version 3)\r\n", n.pack());
|
||||||
|
|
||||||
|
|
||||||
n = PcbNode.parse("(host pcbnew \"(2013-07-07 BZR 4022)-stable\")");
|
n = PcbNode.parse("(host pcbnew \"(2013-07-07 BZR 4022)-stable\")");
|
||||||
assertEquals(2, n.getChildren().size());
|
assertEquals(2, n.getChildren().size());
|
||||||
assertEquals("pcbnew", n.getChildren().get(0));
|
assertEquals("pcbnew", n.getChildren().get(0));
|
||||||
assertEquals("\"(2013-07-07 BZR 4022)-stable\"", n.getChildren().get(1));
|
assertEquals("\"(2013-07-07 BZR 4022)-stable\"", n.getChildren().get(1));
|
||||||
|
|
||||||
|
|
||||||
n = PcbNode.parse("(area 68.835001 116.9924 170.180001 180.5)");
|
n = PcbNode.parse("(area 68.835001 116.9924 170.180001 180.5)");
|
||||||
assertEquals(4, n.getChildren().size());
|
assertEquals(4, n.getChildren().size());
|
||||||
|
|
||||||
n = PcbNode.parse("(kicad_pcb\n (version 3)\r\n (host pcbnew \"(2013-07-07 BZR 4022)-stable\")\n)");
|
n = PcbNode.parse("(kicad_pcb\n (version 3)\r\n (host pcbnew \"(2013-07-07 BZR 4022)-stable\")\n)");
|
||||||
assertEquals(2, n.getChildren().size());
|
assertEquals(2, n.getChildren().size());
|
||||||
assertEquals("(kicad_pcb\r\n" +
|
assertEquals("(kicad_pcb\r\n" +
|
||||||
" (version 3)\r\n" +
|
" (version 3)\r\n" +
|
||||||
"\r\n" +
|
"\r\n" +
|
||||||
" (host pcbnew \"(2013-07-07 BZR 4022)-stable\")\r\n" +
|
" (host pcbnew \"(2013-07-07 BZR 4022)-stable\")\r\n" +
|
||||||
")\r\n", n.pack());
|
")\r\n", n.pack());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testParseModule() {
|
public void testParseModule() {
|
||||||
ModuleNode module = (ModuleNode) PcbNode.parse("(module SM0805 (layer F.Cu) (tedit 52BF06CE) (tstamp 52A5B5B5)\n" +
|
ModuleNode module = (ModuleNode) PcbNode.parse("(module SM0805 (layer F.Cu) (tedit 52BF06CE) (tstamp 52A5B5B5)\n" +
|
||||||
" (at 205.359 170.688 180)\n" +
|
" (at 205.359 170.688 180)\n" +
|
||||||
" (path /52A59B3A)\n" +
|
" (path /52A59B3A)\n" +
|
||||||
" (attr smd)\n" +
|
" (attr smd)\n" +
|
||||||
" (fp_text reference R351 (at -0.127 0 270) (layer F.SilkS)\n" +
|
" (fp_text reference R351 (at -0.127 0 270) (layer F.SilkS)\n" +
|
||||||
" (effects (font (size 0.50038 0.50038) (thickness 0.1016)))\n" +
|
" (effects (font (size 0.50038 0.50038) (thickness 0.1016)))\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (fp_text value 1M (at 0 -1.143 180) (layer F.SilkS) hide\n" +
|
" (fp_text value 1M (at 0 -1.143 180) (layer F.SilkS) hide\n" +
|
||||||
" (effects (font (size 0.50038 0.50038) (thickness 0.10922)))\n" +
|
" (effects (font (size 0.50038 0.50038) (thickness 0.10922)))\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (fp_circle (center -1.651 0.762) (end -1.651 0.635) (layer F.SilkS) (width 0.09906))\n" +
|
" (fp_circle (center -1.651 0.762) (end -1.651 0.635) (layer F.SilkS) (width 0.09906))\n" +
|
||||||
" (fp_line (start -0.508 0.762) (end -1.524 0.762) (layer F.SilkS) (width 0.09906))\n" +
|
" (fp_line (start -0.508 0.762) (end -1.524 0.762) (layer F.SilkS) (width 0.09906))\n" +
|
||||||
" (fp_line (start -1.524 0.762) (end -1.524 -0.762) (layer F.SilkS) (width 0.09906))\n" +
|
" (fp_line (start -1.524 0.762) (end -1.524 -0.762) (layer F.SilkS) (width 0.09906))\n" +
|
||||||
" (fp_line (start -1.524 -0.762) (end -0.508 -0.762) (layer F.SilkS) (width 0.09906))\n" +
|
" (fp_line (start -1.524 -0.762) (end -0.508 -0.762) (layer F.SilkS) (width 0.09906))\n" +
|
||||||
" (fp_line (start 0.508 -0.762) (end 1.524 -0.762) (layer F.SilkS) (width 0.09906))\n" +
|
" (fp_line (start 0.508 -0.762) (end 1.524 -0.762) (layer F.SilkS) (width 0.09906))\n" +
|
||||||
" (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906))\n" +
|
" (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906))\n" +
|
||||||
" (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906))\n" +
|
" (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906))\n" +
|
||||||
" (pad 1 smd rect (at -0.9525 0 180) (size 0.889 1.397)\n" +
|
" (pad 1 smd rect (at -0.9525 0 180) (size 0.889 1.397)\n" +
|
||||||
" (layers F.Cu F.Paste F.Mask)\n" +
|
" (layers F.Cu F.Paste F.Mask)\n" +
|
||||||
" (net 18 N-000002)\n" +
|
" (net 18 N-000002)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 2 smd rect (at 0.9525 0 180) (size 0.889 1.397)\n" +
|
" (pad 2 smd rect (at 0.9525 0 180) (size 0.889 1.397)\n" +
|
||||||
" (layers F.Cu F.Paste F.Mask)\n" +
|
" (layers F.Cu F.Paste F.Mask)\n" +
|
||||||
" (net 14 GND)\n" +
|
" (net 14 GND)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (model smd/chip_cms.wrl\n" +
|
" (model smd/chip_cms.wrl\n" +
|
||||||
" (at (xyz 0 0 0))\n" +
|
" (at (xyz 0 0 0))\n" +
|
||||||
" (scale (xyz 0.1 0.1 0.1))\n" +
|
" (scale (xyz 0.1 0.1 0.1))\n" +
|
||||||
" (rotate (xyz 0 0 0))\n" +
|
" (rotate (xyz 0 0 0))\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" )");
|
" )");
|
||||||
assertEquals("R351", module.name);
|
assertEquals("R351", module.getReference());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testConnected() {
|
public void testConnected() {
|
||||||
ModuleNode p353 = (ModuleNode) PcbNode.parse("(module PIN_ARRAY_10X2 (layer F.Cu) (tedit 52BF05FA) (tstamp 52B9B18D)\n" +
|
ModuleNode p353 = (ModuleNode) PcbNode.parse("(module PIN_ARRAY_10X2 (layer F.Cu) (tedit 52BF05FA) (tstamp 52B9B18D)\n" +
|
||||||
" (at 179.07 166.37 270)\n" +
|
" (at 179.07 166.37 270)\n" +
|
||||||
" (path /52B479E1)\n" +
|
" (path /52B479E1)\n" +
|
||||||
" (fp_text reference P353 (at 2.667 -3.048 360) (layer F.SilkS)\n" +
|
" (fp_text reference P353 (at 2.667 -3.048 360) (layer F.SilkS)\n" +
|
||||||
" (effects (font (size 0.50038 0.50038) (thickness 0.1016)))\n" +
|
" (effects (font (size 0.50038 0.50038) (thickness 0.1016)))\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (fp_text value CONN_10X2 (at 0.254 4.318 270) (layer F.SilkS) hide\n" +
|
" (fp_text value CONN_10X2 (at 0.254 4.318 270) (layer F.SilkS) hide\n" +
|
||||||
" (effects (font (size 1.016 1.016) (thickness 0.2032)))\n" +
|
" (effects (font (size 1.016 1.016) (thickness 0.2032)))\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (fp_line (start 12.49934 2.49936) (end 12.49934 -2.49936) (layer F.SilkS) (width 0.09906))\n" +
|
" (fp_line (start 12.49934 2.49936) (end 12.49934 -2.49936) (layer F.SilkS) (width 0.09906))\n" +
|
||||||
" (fp_line (start 12.49934 -2.49936) (end -12.7508 -2.49936) (layer F.SilkS) (width 0.09906))\n" +
|
" (fp_line (start 12.49934 -2.49936) (end -12.7508 -2.49936) (layer F.SilkS) (width 0.09906))\n" +
|
||||||
" (fp_line (start -12.7508 -2.49936) (end -12.7508 2.49936) (layer F.SilkS) (width 0.09906))\n" +
|
" (fp_line (start -12.7508 -2.49936) (end -12.7508 2.49936) (layer F.SilkS) (width 0.09906))\n" +
|
||||||
" (fp_line (start -12.7508 2.49936) (end 12.49934 2.49936) (layer F.SilkS) (width 0.09906))\n" +
|
" (fp_line (start -12.7508 2.49936) (end 12.49934 2.49936) (layer F.SilkS) (width 0.09906))\n" +
|
||||||
" (pad 1 thru_hole rect (at -11.47064 1.27 270) (size 1.524 1.524) (drill 0.8128)\n" +
|
" (pad 1 thru_hole rect (at -11.47064 1.27 270) (size 1.524 1.524) (drill 0.8128)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" (net 3 /CAN_TX)\n" +
|
" (net 3 /CAN_TX)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 2 thru_hole circle (at -11.47064 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 2 thru_hole circle (at -11.47064 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" (net 5 /CS2)\n" +
|
" (net 5 /CS2)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 3 thru_hole circle (at -8.93064 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 3 thru_hole circle (at -8.93064 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" (net 9 /SPI_MISO)\n" +
|
" (net 9 /SPI_MISO)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 4 thru_hole circle (at -8.93064 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 4 thru_hole circle (at -8.93064 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" (net 10 /SPI_MOSI)\n" +
|
" (net 10 /SPI_MOSI)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 5 thru_hole circle (at -6.39064 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 5 thru_hole circle (at -6.39064 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" (net 4 /CS1)\n" +
|
" (net 4 /CS1)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 6 thru_hole circle (at -6.39064 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 6 thru_hole circle (at -6.39064 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" (net 11 /SPI_SCK)\n" +
|
" (net 11 /SPI_SCK)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 7 thru_hole circle (at -3.85064 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 7 thru_hole circle (at -3.85064 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" (net 6 /CS3)\n" +
|
" (net 6 /CS3)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 8 thru_hole circle (at -3.85064 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 8 thru_hole circle (at -3.85064 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 9 thru_hole circle (at -1.31064 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 9 thru_hole circle (at -1.31064 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" (net 7 /CS4)\n" +
|
" (net 7 /CS4)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 10 thru_hole circle (at -1.31064 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 10 thru_hole circle (at -1.31064 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" (net 8 /CS_SD_MODULE)\n" +
|
" (net 8 /CS_SD_MODULE)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 11 thru_hole circle (at 1.22936 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 11 thru_hole circle (at 1.22936 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 12 thru_hole circle (at 1.22936 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 12 thru_hole circle (at 1.22936 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 13 thru_hole circle (at 3.76936 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 13 thru_hole circle (at 3.76936 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 14 thru_hole circle (at 3.76936 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 14 thru_hole circle (at 3.76936 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 15 thru_hole circle (at 6.30936 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 15 thru_hole circle (at 6.30936 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" (net 13 /USART_TX)\n" +
|
" (net 13 /USART_TX)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 16 thru_hole circle (at 6.30936 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 16 thru_hole circle (at 6.30936 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" (net 12 /USART_RX)\n" +
|
" (net 12 /USART_RX)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 17 thru_hole circle (at 8.84936 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 17 thru_hole circle (at 8.84936 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 18 thru_hole circle (at 8.84936 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 18 thru_hole circle (at 8.84936 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 19 thru_hole circle (at 11.38936 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 19 thru_hole circle (at 11.38936 1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 20 thru_hole circle (at 11.38936 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
" (pad 20 thru_hole circle (at 11.38936 -1.27 270) (size 1.524 1.524) (drill 1.016)\n" +
|
||||||
" (layers *.Cu *.Mask F.SilkS)\n" +
|
" (layers *.Cu *.Mask F.SilkS)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (model lib/3d/M_header_10x2.wrl\n" +
|
" (model lib/3d/M_header_10x2.wrl\n" +
|
||||||
" (at (xyz 0 0 0))\n" +
|
" (at (xyz 0 0 0))\n" +
|
||||||
" (scale (xyz 1 1 1))\n" +
|
" (scale (xyz 1 1 1))\n" +
|
||||||
" (rotate (xyz -90 0 0))\n" +
|
" (rotate (xyz -90 0 0))\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" )\n");
|
" )\n");
|
||||||
|
|
||||||
SegmentNode segment = (SegmentNode) PcbNode.parse("(segment (start 221.32036 156.21) (end 222.631 154.89936) (width 0.254) (layer B.Cu) (net 5) (tstamp 52BE7B1B))");
|
SegmentNode segment = (SegmentNode) PcbNode.parse("(segment (start 221.32036 156.21) (end 222.631 154.89936) (width 0.254) (layer B.Cu) (net 5) (tstamp 52BE7B1B))");
|
||||||
|
|
||||||
assertFalse(p353.isConnected(segment.end));
|
assertFalse(p353.isConnected(segment.end));
|
||||||
assertFalse(p353.isConnected(segment.start));
|
assertFalse(p353.isConnected(segment.start));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testSegmentConnected() {
|
public void testSegmentConnected() {
|
||||||
SegmentNode s1 = (SegmentNode) PcbNode.parse("(segment (start 219.075 162.941) (end 219.075 163.322) (width 0.254) (layer F.Cu) (net 7) (tstamp 52BC5D9B))");
|
SegmentNode s1 = (SegmentNode) PcbNode.parse("(segment (start 219.075 162.941) (end 219.075 163.322) (width 0.254) (layer F.Cu) (net 7) (tstamp 52BC5D9B))");
|
||||||
|
|
||||||
SegmentNode s0 = (SegmentNode) PcbNode.parse("(segment (start 216.662 161.544) (end 217.678 161.544) (width 0.254) (layer B.Cu) (net 7) (tstamp 52BC5D95))");
|
SegmentNode s0 = (SegmentNode) PcbNode.parse("(segment (start 216.662 161.544) (end 217.678 161.544) (width 0.254) (layer B.Cu) (net 7) (tstamp 52BC5D95))");
|
||||||
SegmentNode s2 = (SegmentNode) PcbNode.parse("(segment (start 219.075 162.941) (end 219.075 163.322) (width 0.254) (layer F.Cu) (net 7) (tstamp 52BC5D9B))");
|
SegmentNode s2 = (SegmentNode) PcbNode.parse("(segment (start 219.075 162.941) (end 219.075 163.322) (width 0.254) (layer F.Cu) (net 7) (tstamp 52BC5D9B))");
|
||||||
|
|
||||||
assertFalse(RemoveUnneededTraces.isUnused(Arrays.asList(s0, s2), s1, Collections.<PcbNode>emptyList()));
|
assertFalse(RemoveUnneededTraces.isUnused(Arrays.asList(s0, s2), s1, Collections.<PcbNode>emptyList()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testSegmentConnected2() {
|
public void testSegmentConnected2() {
|
||||||
SegmentNode s = (SegmentNode) PcbNode.parse("(segment (start 213.106 171.069) (end 213.106 166.3065) (width 0.254) (layer F.Cu) (net 22))");
|
SegmentNode s = (SegmentNode) PcbNode.parse("(segment (start 213.106 171.069) (end 213.106 166.3065) (width 0.254) (layer F.Cu) (net 22))");
|
||||||
|
|
||||||
|
|
||||||
ModuleNode mn = (ModuleNode) PcbNode.parse("(module MINI-USB-5P-3400020P1 (layer F.Cu) (tedit 52C0C373) (tstamp 52BAC27E)\n" +
|
ModuleNode mn = (ModuleNode) PcbNode.parse("(module MINI-USB-5P-3400020P1 (layer F.Cu) (tedit 52C0C373) (tstamp 52BAC27E)\n" +
|
||||||
" (at 213.106 175.26)\n" +
|
" (at 213.106 175.26)\n" +
|
||||||
" (descr OPL)\n" +
|
" (descr OPL)\n" +
|
||||||
" (tags \"USB MINI 5 SMD-1\")\n" +
|
" (tags \"USB MINI 5 SMD-1\")\n" +
|
||||||
" (path /52C034E1)\n" +
|
" (path /52C034E1)\n" +
|
||||||
" (attr smd)\n" +
|
" (attr smd)\n" +
|
||||||
" (fp_text reference J351 (at 0 -1.905) (layer F.SilkS)\n" +
|
" (fp_text reference J351 (at 0 -1.905) (layer F.SilkS)\n" +
|
||||||
" (effects (font (size 0.50038 0.50038) (thickness 0.1016)))\n" +
|
" (effects (font (size 0.50038 0.50038) (thickness 0.1016)))\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (fp_text value MINI-USB-5P-3400020P1 (at 0.762 -0.254) (layer F.SilkS) hide\n" +
|
" (fp_text value MINI-USB-5P-3400020P1 (at 0.762 -0.254) (layer F.SilkS) hide\n" +
|
||||||
" (effects (font (size 0.4318 0.4318) (thickness 0.0508)))\n" +
|
" (effects (font (size 0.4318 0.4318) (thickness 0.0508)))\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (fp_line (start 3.81 4.572) (end 3.81 3.103) (layer F.SilkS) (width 0.127))\n" +
|
" (fp_line (start 3.81 4.572) (end 3.81 3.103) (layer F.SilkS) (width 0.127))\n" +
|
||||||
" (fp_line (start -3.81 4.572) (end -3.81 3.103) (layer F.SilkS) (width 0.127))\n" +
|
" (fp_line (start -3.81 4.572) (end -3.81 3.103) (layer F.SilkS) (width 0.127))\n" +
|
||||||
" (fp_line (start 2.032 -4.572) (end 3.302 -4.572) (layer F.SilkS) (width 0.127))\n" +
|
" (fp_line (start 2.032 -4.572) (end 3.302 -4.572) (layer F.SilkS) (width 0.127))\n" +
|
||||||
" (fp_line (start 3.81 -2.297) (end 3.81 0.103) (layer F.SilkS) (width 0.127))\n" +
|
" (fp_line (start 3.81 -2.297) (end 3.81 0.103) (layer F.SilkS) (width 0.127))\n" +
|
||||||
" (fp_line (start -3.81 4.572) (end 3.81 4.572) (layer F.SilkS) (width 0.127))\n" +
|
" (fp_line (start -3.81 4.572) (end 3.81 4.572) (layer F.SilkS) (width 0.127))\n" +
|
||||||
" (fp_line (start -3.81 -2.297) (end -3.81 0.103) (layer F.SilkS) (width 0.127))\n" +
|
" (fp_line (start -3.81 -2.297) (end -3.81 0.103) (layer F.SilkS) (width 0.127))\n" +
|
||||||
" (fp_line (start -3.3 -4.572) (end -2.1 -4.572) (layer F.SilkS) (width 0.127))\n" +
|
" (fp_line (start -3.3 -4.572) (end -2.1 -4.572) (layer F.SilkS) (width 0.127))\n" +
|
||||||
" (pad 5 smd rect (at -1.6 -4.191) (size 0.508 2.54)\n" +
|
" (pad 5 smd rect (at -1.6 -4.191) (size 0.508 2.54)\n" +
|
||||||
" (layers F.Cu F.Paste F.Mask)\n" +
|
" (layers F.Cu F.Paste F.Mask)\n" +
|
||||||
" (net 14 GND)\n" +
|
" (net 14 GND)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 4 smd rect (at -0.8 -4.191) (size 0.508 2.54)\n" +
|
" (pad 4 smd rect (at -0.8 -4.191) (size 0.508 2.54)\n" +
|
||||||
" (layers F.Cu F.Paste F.Mask)\n" +
|
" (layers F.Cu F.Paste F.Mask)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 3 smd rect (at 0 -4.191) (size 0.508 2.54)\n" +
|
" (pad 3 smd rect (at 0 -4.191) (size 0.508 2.54)\n" +
|
||||||
" (layers F.Cu F.Paste F.Mask)\n" +
|
" (layers F.Cu F.Paste F.Mask)\n" +
|
||||||
" (net 22 N-0000056)\n" +
|
" (net 22 N-0000056)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 2 smd rect (at 0.8 -4.191) (size 0.508 2.54)\n" +
|
" (pad 2 smd rect (at 0.8 -4.191) (size 0.508 2.54)\n" +
|
||||||
" (layers F.Cu F.Paste F.Mask)\n" +
|
" (layers F.Cu F.Paste F.Mask)\n" +
|
||||||
" (net 19 N-000003)\n" +
|
" (net 19 N-000003)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 1 smd rect (at 1.6 -4.191) (size 0.508 2.54)\n" +
|
" (pad 1 smd rect (at 1.6 -4.191) (size 0.508 2.54)\n" +
|
||||||
" (layers F.Cu F.Paste F.Mask)\n" +
|
" (layers F.Cu F.Paste F.Mask)\n" +
|
||||||
" (net 15 N-000001)\n" +
|
" (net 15 N-000001)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 6 smd rect (at -4.5 1.603 90) (size 2.794 2)\n" +
|
" (pad 6 smd rect (at -4.5 1.603 90) (size 2.794 2)\n" +
|
||||||
" (layers F.Cu F.Paste F.Mask)\n" +
|
" (layers F.Cu F.Paste F.Mask)\n" +
|
||||||
" (net 18 N-000002)\n" +
|
" (net 18 N-000002)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 6 smd rect (at 4.5 1.603 90) (size 2.794 2)\n" +
|
" (pad 6 smd rect (at 4.5 1.603 90) (size 2.794 2)\n" +
|
||||||
" (layers F.Cu F.Paste F.Mask)\n" +
|
" (layers F.Cu F.Paste F.Mask)\n" +
|
||||||
" (net 18 N-000002)\n" +
|
" (net 18 N-000002)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 6 smd rect (at -4.5 -3.897 90) (size 2.794 2)\n" +
|
" (pad 6 smd rect (at -4.5 -3.897 90) (size 2.794 2)\n" +
|
||||||
" (layers F.Cu F.Paste F.Mask)\n" +
|
" (layers F.Cu F.Paste F.Mask)\n" +
|
||||||
" (net 18 N-000002)\n" +
|
" (net 18 N-000002)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad 6 smd rect (at 4.5 -3.897 90) (size 2.794 2)\n" +
|
" (pad 6 smd rect (at 4.5 -3.897 90) (size 2.794 2)\n" +
|
||||||
" (layers F.Cu F.Paste F.Mask)\n" +
|
" (layers F.Cu F.Paste F.Mask)\n" +
|
||||||
" (net 18 N-000002)\n" +
|
" (net 18 N-000002)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad \"\" np_thru_hole circle (at -2.159 -1.397 90) (size 1.016 1.016) (drill 0.762)\n" +
|
" (pad \"\" np_thru_hole circle (at -2.159 -1.397 90) (size 1.016 1.016) (drill 0.762)\n" +
|
||||||
" (layers *.Mask F.SilkS)\n" +
|
" (layers *.Mask F.SilkS)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (pad \"\" np_thru_hole circle (at 2.159 -1.397 90) (size 1.016 1.016) (drill 0.762)\n" +
|
" (pad \"\" np_thru_hole circle (at 2.159 -1.397 90) (size 1.016 1.016) (drill 0.762)\n" +
|
||||||
" (layers *.Mask F.SilkS)\n" +
|
" (layers *.Mask F.SilkS)\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" (model lib/3d/usb-2.wrl\n" +
|
" (model lib/3d/usb-2.wrl\n" +
|
||||||
" (at (xyz 0 0 0))\n" +
|
" (at (xyz 0 0 0))\n" +
|
||||||
" (scale (xyz 1 1 1))\n" +
|
" (scale (xyz 1 1 1))\n" +
|
||||||
" (rotate (xyz -90 0 -90))\n" +
|
" (rotate (xyz -90 0 -90))\n" +
|
||||||
" )\n" +
|
" )\n" +
|
||||||
" )");
|
" )");
|
||||||
|
|
||||||
assertTrue(mn.isConnected(s.start));
|
assertTrue(mn.isConnected(s.start));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,59 +1,59 @@
|
||||||
package com.rusefi.util;
|
package com.rusefi.util;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileReader;
|
import java.io.FileReader;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generic file utilities
|
* Generic file utilities
|
||||||
* <p/>
|
* <p/>
|
||||||
* 12/9/13
|
* 12/9/13
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
*/
|
*/
|
||||||
public class FileUtils {
|
public class FileUtils {
|
||||||
private FileUtils() {
|
private FileUtils() {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param fileName
|
* @param fileName
|
||||||
* @return Full content of the file as one String
|
* @return Full content of the file as one String
|
||||||
* @throws IOException
|
* @throws IOException
|
||||||
*/
|
*/
|
||||||
public static String readFile(String fileName) throws IOException {
|
public 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");
|
||||||
br.close();
|
br.close();
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<String> readFileToList(String fileName) throws IOException {
|
public 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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,2 +1,10 @@
|
||||||
Here we have some tiny utilities
|
Here we have some tiny dev utilities - average rusEfi user would not need to use any of these!
|
||||||
gcc_map_reader reads the .map file produced by GCC and prints some details on what is RAM used for
|
|
||||||
|
|
||||||
|
gcc_map_reader reads the .map file produced by GCC and prints some details on what is RAM used for
|
||||||
|
|
||||||
|
ts2c reads a piece of TunerStudio map and produces a matching C language piece of code
|
||||||
|
|
||||||
|
version2header creates a C language header containting current SVN version
|
||||||
|
|
||||||
|
enum2string
|
||||||
Binary file not shown.
|
|
@ -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>
|
||||||
|
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue