rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2015-03-06 11:06:57 -06:00
parent 15785cf43c
commit 90fd482b96
11 changed files with 150 additions and 542 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java_console/build.xml
View File

@ -7,11 +7,12 @@
<target name="compile"> <target name="compile">
<mkdir dir="build/classes"/> <mkdir dir="build/classes"/>
<javac debug="yes" destdir="build/classes" classpath="lib/junit.jar:lib/jssc.jar:lib/SteelSeries-3.9.30.jar:lib/annotations.jar:lib/miglayout-4.0.jar:lib/surfaceplotter-2.0.1.jar"> <javac debug="yes" destdir="build/classes" classpath="lib/swing-layout-1.0.jar:lib/jep.jar:lib/log4j.jar:lib/junit.jar:lib/jssc.jar:lib/SteelSeries-3.9.30.jar:lib/annotations.jar:lib/miglayout-4.0.jar:lib/surfaceplotter-2.0.1.jar">
<src path="autotest/src"/> <src path="autotest/src"/>
<src path="io/src"/> <src path="io/src"/>
<src path="models/src"/> <src path="models/src"/>
<src path="ui/src"/> <src path="ui/src"/>
<src path="romraider/src"/>
</javac> </javac>
@ -29,6 +30,7 @@
<fileset dir="io/src" includes="**/test/**/*Test.java"/> <fileset dir="io/src" includes="**/test/**/*Test.java"/>
<fileset dir="models/src" includes="**/test/**/*Test.java"/> <fileset dir="models/src" includes="**/test/**/*Test.java"/>
<fileset dir="ui/src" includes="**/test/**/*Test.java"/> <fileset dir="ui/src" includes="**/test/**/*Test.java"/>
<fileset dir="romraider/src" includes="**/test/**/*Test.java"/>
</batchtest> </batchtest>
</junit> </junit>

60
java_console/romraider/src/com/romraider/ECUExec.java
View File

@ -19,30 +19,20 @@
package com.romraider; package com.romraider;
import static com.romraider.Version.BUILDNUMBER; import com.romraider.editor.ecu.ECUEditor;
import static com.romraider.Version.PRODUCT_NAME; import com.romraider.util.JREChecker;
import static com.romraider.Version.SUPPORT_URL; import org.apache.log4j.Logger;
import static com.romraider.Version.VERSION;
import static com.romraider.editor.ecu.ECUEditorManager.getECUEditor;
import static com.romraider.swing.LookAndFeelManager.initLookAndFeel;
import static com.romraider.util.LogManager.initDebugLogging;
import static com.romraider.util.RomServer.isRunning;
import static com.romraider.util.RomServer.sendRomToOpenInstance;
import static com.romraider.util.RomServer.waitForRom;
import static javax.swing.JOptionPane.INFORMATION_MESSAGE;
import static javax.swing.JOptionPane.WARNING_MESSAGE;
import static javax.swing.JOptionPane.showMessageDialog;
import static javax.swing.SwingUtilities.invokeLater;
import static javax.swing.WindowConstants.EXIT_ON_CLOSE;
import static org.apache.log4j.Logger.getLogger;
import java.io.File; import java.io.File;
import java.text.DateFormat; import java.text.DateFormat;
import org.apache.log4j.Logger; import static com.romraider.Version.*;
import static com.romraider.editor.ecu.ECUEditorManager.getECUEditor;
import com.romraider.editor.ecu.ECUEditor; import static com.romraider.swing.LookAndFeelManager.initLookAndFeel;
import com.romraider.util.JREChecker; import static com.romraider.util.LogManager.initDebugLogging;
import static javax.swing.JOptionPane.*;
import static javax.swing.SwingUtilities.invokeLater;
import static org.apache.log4j.Logger.getLogger;
public class ECUExec { public class ECUExec {
private static final Logger LOGGER = getLogger(ECUExec.class); private static final Logger LOGGER = getLogger(ECUExec.class);
@ -83,15 +73,7 @@ public class ECUExec {
initLookAndFeel(); initLookAndFeel();
// check if already running // check if already running
if (isRunning()) {
if (args.length == 0 || containsLoggerArg(args)) {
showAlreadyRunningMessage();
} else {
sendRomToOpenInstance(args[0]);
}
} else {
openEditor(args); openEditor(args);
}
} }
private static void showAlreadyRunningMessage() { private static void showAlreadyRunningMessage() {
@ -130,17 +112,17 @@ public class ECUExec {
if (args.length > 0) { if (args.length > 0) {
openRom(editor, args[0]); openRom(editor, args[0]);
} }
startRomListener(editor); //startRomListener(editor);
} }
private static void startRomListener(ECUEditor editor) { // private static void startRomListener(ECUEditor editor) {
try { // try {
while (true) { // while (true) {
String rom = waitForRom(); // String rom = waitForRom();
openRom(editor, rom); // openRom(editor, rom);
} // }
} catch (Throwable e) { // } catch (Throwable e) {
LOGGER.error("Error occurred", e); // LOGGER.error("Error occurred", e);
} // }
} // }
} }

8
java_console/romraider/src/com/romraider/Settings.java
View File

@ -20,7 +20,7 @@
package com.romraider; package com.romraider;
import static com.romraider.Version.RELEASE_NOTES; import static com.romraider.Version.RELEASE_NOTES;
import static com.romraider.Version.ROM_REVISION_URL; //import static com.romraider.Version.ROM_REVISION_URL;
import static com.romraider.Version.SUPPORT_URL; import static com.romraider.Version.SUPPORT_URL;
import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; import static com.romraider.util.ParamChecker.checkNotNullOrEmpty;
@ -308,9 +308,9 @@ public class Settings implements Serializable {
this.windowMaximized = windowMaximized; this.windowMaximized = windowMaximized;
} }
public String getRomRevisionURL() { // public String getRomRevisionURL() {
return ROM_REVISION_URL; // return ROM_REVISION_URL;
} // }
public String getSupportURL() { public String getSupportURL() {
return SUPPORT_URL; return SUPPORT_URL;

10
java_console/romraider/src/com/romraider/Version.java
View File

@ -25,12 +25,12 @@ import javax.swing.ImageIcon;
public final class Version { public final class Version {
public static final String PRODUCT_NAME = "RomRaider"; public static final String PRODUCT_NAME = "RomRaider";
public static final String VERSION = "0.5.8 RC 1"; public static final String VERSION = "0.5.8 RC 1 for rusEfi";
public static final String BUILDNUMBER = "635"; public static final String BUILDNUMBER = "635";
public static final String SUPPORT_URL = "http://www.romraider.com"; public static final String SUPPORT_URL = "http://www.rusefi.com";
public static final String ROM_REVISION_URL = "http://www.scoobypedia.co.uk/index.php/Knowledge/ECUVersionCompatibilityList"; // public static final String ROM_REVISION_URL = "http://www.scoobypedia.co.uk/index.php/Knowledge/ECUVersionCompatibilityList";
public static final String ECU_DEFS_URL = "http://www.romraider.com/forum/topic360.html"; // public static final String ECU_DEFS_URL = "http://www.romraider.com/forum/topic360.html";
public static final String LOGGER_DEFS_URL = "http://www.romraider.com/forum/topic1642.html"; // public static final String LOGGER_DEFS_URL = "http://www.romraider.com/forum/topic1642.html";
public static final String CARS_DEFS_URL = "http://www.romraider.com/forum/topic5792.html"; public static final String CARS_DEFS_URL = "http://www.romraider.com/forum/topic5792.html";
public static final String RELEASE_NOTES = "release_notes.txt"; public static final String RELEASE_NOTES = "release_notes.txt";
public static final ImageIcon ABOUT_ICON = new ImageIcon(Version.class.getClass().getResource("/graphics/romraider-ico-large.gif")); public static final ImageIcon ABOUT_ICON = new ImageIcon(Version.class.getClass().getResource("/graphics/romraider-ico-large.gif"));

6
java_console/romraider/src/com/romraider/editor/ecu/ECUEditor.java
View File

@ -19,7 +19,7 @@
package com.romraider.editor.ecu; package com.romraider.editor.ecu;
import static com.romraider.Version.ECU_DEFS_URL; //import static com.romraider.Version.ECU_DEFS_URL;
import static com.romraider.Version.PRODUCT_NAME; import static com.romraider.Version.PRODUCT_NAME;
import static com.romraider.Version.VERSION; import static com.romraider.Version.VERSION;
import static javax.swing.JOptionPane.DEFAULT_OPTION; import static javax.swing.JOptionPane.DEFAULT_OPTION;
@ -182,7 +182,7 @@ public class ECUEditor extends AbstractFrame {
options, options,
options[0]); options[0]);
if (answer == 0) { if (answer == 0) {
BrowserControl.displayURL(ECU_DEFS_URL); // BrowserControl.displayURL(ECU_DEFS_URL);
} else { } else {
showMessageDialog(this, showMessageDialog(this,
"ECU definition files need to be configured before ROM images can be opened.\nMenu: ECU Definitions > ECU Definition Manager...", "ECU definition files need to be configured before ROM images can be opened.\nMenu: ECU Definitions > ECU Definition Manager...",
@ -298,7 +298,7 @@ public class ECUEditor extends AbstractFrame {
infoPanel.setLayout(new GridLayout(3, 1)); infoPanel.setLayout(new GridLayout(3, 1));
infoPanel.add(new JLabel("A newer version of this ECU revision exists. " + infoPanel.add(new JLabel("A newer version of this ECU revision exists. " +
"Please visit the following link to download the latest revision:")); "Please visit the following link to download the latest revision:"));
infoPanel.add(new URL(settings.getRomRevisionURL())); // infoPanel.add(new URL(settings.getRomRevisionURL()));
JCheckBox check = new JCheckBox("Always display this message", true); JCheckBox check = new JCheckBox("Always display this message", true);
check.setHorizontalAlignment(JCheckBox.RIGHT); check.setHorizontalAlignment(JCheckBox.RIGHT);

316
java_console/romraider/src/com/romraider/logger/ecu/ui/swing/vertical/VerticalTextIcon.java
View File

@ -1,316 +0,0 @@
/*
* RomRaider Open-Source Tuning, Logging and Reflashing
* Copyright (C) 2006-2012 RomRaider.com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
package com.romraider.logger.ecu.ui.swing.vertical;
import javax.swing.Icon;
import java.awt.Component;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
/**
* VTextIcon is an Icon implementation which draws a short string vertically.
* It's useful for JTabbedPanes with LEFT or RIGHT tabs but can be used in any
* component which supports Icons, such as JLabel or JButton
* You can provide a hint to indicate whether to rotate the string
* to the left or right, or not at all, and it checks to make sure
* that the rotation is legal for the given string
* (for example, Chinese/Japanese/Korean scripts have special rules when
* drawn vertically and should never be rotated)
*/
public final class VerticalTextIcon implements Icon, PropertyChangeListener {
String fLabel;
String[] fCharStrings; // for efficiency, break the fLabel into one-char strings to be passed to drawString
int[] fCharWidths; // Roman characters should be centered when not rotated (Japanese fonts are monospaced)
int[] fPosition; // Japanese half-height characters need to be shifted when drawn vertically
int fWidth, fHeight, fCharHeight, fDescent; // Cached for speed
int fRotation;
Component fComponent;
static final int POSITION_NORMAL = 0;
static final int POSITION_TOP_RIGHT = 1;
static final int POSITION_FAR_TOP_RIGHT = 2;
public static final int ROTATE_DEFAULT = 0x00;
public static final int ROTATE_NONE = 0x01;
public static final int ROTATE_LEFT = 0x02;
public static final int ROTATE_RIGHT = 0x04;
/**
* Creates a <code>VTextIcon</code> for the specified <code>component</code>
* with the specified <code>label</code>.
* It sets the orientation to the default for the string
*
* @see #verifyRotation
*/
public VerticalTextIcon(Component component, String label) {
this(component, label, ROTATE_DEFAULT);
}
/**
* Creates a <code>VTextIcon</code> for the specified <code>component</code>
* with the specified <code>label</code>.
* It sets the orientation to the provided value if it's legal for the string
*
* @see #verifyRotation
*/
public VerticalTextIcon(Component component, String label, int rotateHint) {
fComponent = component;
fLabel = label;
fRotation = verifyRotation(label, rotateHint);
calcDimensions();
fComponent.addPropertyChangeListener(this);
}
/**
* sets the label to the given string, updating the orientation as needed
* and invalidating the layout if the size changes
*
* @see #verifyRotation
*/
public void setLabel(String label) {
fLabel = label;
fRotation = verifyRotation(label, fRotation); // Make sure the current rotation is still legal
recalcDimensions();
}
/**
* Checks for changes to the font on the fComponent
* so that it can invalidate the layout if the size changes
*/
public void propertyChange(PropertyChangeEvent e) {
String prop = e.getPropertyName();
if ("font".equals(prop)) {
recalcDimensions();
}
}
/**
* Calculates the dimensions. If they've changed,
* invalidates the component
*/
void recalcDimensions() {
int wOld = getIconWidth();
int hOld = getIconHeight();
calcDimensions();
if (wOld != getIconWidth() || hOld != getIconHeight())
fComponent.invalidate();
}
void calcDimensions() {
FontMetrics fm = fComponent.getFontMetrics(fComponent.getFont());
fCharHeight = fm.getAscent() + fm.getDescent();
fDescent = fm.getDescent();
if (fRotation == ROTATE_NONE) {
int len = fLabel.length();
char data[] = new char[len];
fLabel.getChars(0, len, data, 0);
// if not rotated, width is that of the widest char in the string
fWidth = 0;
// we need an array of one-char strings for drawString
fCharStrings = new String[len];
fCharWidths = new int[len];
fPosition = new int[len];
char ch;
for (int i = 0; i < len; i++) {
ch = data[i];
fCharWidths[i] = fm.charWidth(ch);
if (fCharWidths[i] > fWidth)
fWidth = fCharWidths[i];
fCharStrings[i] = new String(data, i, 1);
// small kana and punctuation
if (sDrawsInTopRight.indexOf(ch) >= 0) // if ch is in sDrawsInTopRight
fPosition[i] = POSITION_TOP_RIGHT;
else if (sDrawsInFarTopRight.indexOf(ch) >= 0)
fPosition[i] = POSITION_FAR_TOP_RIGHT;
else
fPosition[i] = POSITION_NORMAL;
}
// and height is the font height * the char count, + one extra leading at the bottom
fHeight = fCharHeight * len + fDescent;
} else {
// if rotated, width is the height of the string
fWidth = fCharHeight;
// and height is the width, plus some buffer space
fHeight = fm.stringWidth(fLabel) + 2 * kBufferSpace;
}
}
/**
* Draw the icon at the specified location. Icon implementations
* may use the Component argument to get properties useful for
* painting, e.g. the foreground or background color.
*/
public void paintIcon(Component c, Graphics g, int x, int y) {
// We don't insist that it be on the same Component
g.setColor(c.getForeground());
g.setFont(c.getFont());
if (fRotation == ROTATE_NONE) {
int yPos = y + fCharHeight;
for (int i = 0; i < fCharStrings.length; i++) {
// Special rules for Japanese - "half-height" characters (like ya, yu, yo in combinations)
// should draw in the top-right quadrant when drawn vertically
// - they draw in the bottom-left normally
int tweak;
switch (fPosition[i]) {
case POSITION_NORMAL:
// Roman fonts should be centered. Japanese fonts are always monospaced.
g.drawString(fCharStrings[i], x + ((fWidth - fCharWidths[i]) / 2), yPos);
break;
case POSITION_TOP_RIGHT:
tweak = fCharHeight / 3; // Should be 2, but they aren't actually half-height
g.drawString(fCharStrings[i], x + (tweak / 2), yPos - tweak);
break;
case POSITION_FAR_TOP_RIGHT:
tweak = fCharHeight - fCharHeight / 3;
g.drawString(fCharStrings[i], x + (tweak / 2), yPos - tweak);
break;
}
yPos += fCharHeight;
}
} else if (fRotation == ROTATE_LEFT) {
g.translate(x + fWidth, y + fHeight);
((Graphics2D) g).rotate(-NINETY_DEGREES);
g.drawString(fLabel, kBufferSpace, -fDescent);
((Graphics2D) g).rotate(NINETY_DEGREES);
g.translate(-(x + fWidth), -(y + fHeight));
} else if (fRotation == ROTATE_RIGHT) {
g.translate(x, y);
((Graphics2D) g).rotate(NINETY_DEGREES);
g.drawString(fLabel, kBufferSpace, -fDescent);
((Graphics2D) g).rotate(-NINETY_DEGREES);
g.translate(-x, -y);
}
}
/**
* Returns the icon's width.
*
* @return an int specifying the fixed width of the icon.
*/
public int getIconWidth() {
return fWidth;
}
/**
* Returns the icon's height.
*
* @return an int specifying the fixed height of the icon.
*/
public int getIconHeight() {
return fHeight;
}
/**
* verifyRotation
* <p/>
* returns the best rotation for the string (ROTATE_NONE, ROTATE_LEFT, ROTATE_RIGHT)
* <p/>
* This is public static so you can use it to test a string without creating a VTextIcon
* <p/>
* from http://www.unicode.org/unicode/reports/tr9/tr9-3.html
* When setting text using the Arabic script in vertical lines,
* it is more common to employ a horizontal baseline that
* is rotated by 90<EFBFBD> counterclockwise so that the characters
* are ordered from top to bottom. Latin text and numbers
* may be rotated 90<EFBFBD> clockwise so that the characters
* are also ordered from top to bottom.
* <p/>
* Rotation rules
* - Roman can rotate left, right, or none - default right (counterclockwise)
* - CJK can't rotate
* - Arabic must rotate - default left (clockwise)
* <p/>
* from the online edition of _The Unicode Standard, Version 3.0_, file ch10.pdf page 4
* Ideographs are found in three blocks of the Unicode Standard...
* U+4E00-U+9FFF, U+3400-U+4DFF, U+F900-U+FAFF
* <p/>
* Hiragana is U+3040-U+309F, katakana is U+30A0-U+30FF
* <p/>
* from http://www.unicode.org/unicode/faq/writingdirections.html
* East Asian scripts are frequently written in vertical lines
* which run from top-to-bottom and are arrange columns either
* from left-to-right (Mongolian) or right-to-left (other scripts).
* Most characters use the same shape and orientation when displayed
* horizontally or vertically, but many punctuation characters
* will change their shape when displayed vertically.
* <p/>
* Letters and words from other scripts are generally rotated through
* ninety degree angles so that they, too, will read from top to bottom.
* That is, letters from left-to-right scripts will be rotated clockwise
* and letters from right-to-left scripts counterclockwise, both
* through ninety degree angles.
* <p/>
* Unlike the bidirectional case, the choice of vertical layout
* is usually treated as a formatting style; therefore,
* the Unicode Standard does not define default rendering behavior
* for vertical text nor provide directionality controls designed to override such behavior
*/
public static int verifyRotation(String label, int rotateHint) {
boolean hasCJK = false;
boolean hasMustRotate = false; // Arabic, etc
int len = label.length();
char data[] = new char[len];
char ch;
label.getChars(0, len, data, 0);
for (int i = 0; i < len; i++) {
ch = data[i];
if ((ch >= '\u4E00' && ch <= '\u9FFF') ||
(ch >= '\u3400' && ch <= '\u4DFF') ||
(ch >= '\uF900' && ch <= '\uFAFF') ||
(ch >= '\u3040' && ch <= '\u309F') ||
(ch >= '\u30A0' && ch <= '\u30FF'))
hasCJK = true;
if ((ch >= '\u0590' && ch <= '\u05FF') || // Hebrew
(ch >= '\u0600' && ch <= '\u06FF') || // Arabic
(ch >= '\u0700' && ch <= '\u074F')) // Syriac
hasMustRotate = true;
}
// If you mix Arabic with Chinese, you're on your own
if (hasCJK)
return DEFAULT_CJK;
int legal = hasMustRotate ? LEGAL_MUST_ROTATE : LEGAL_ROMAN;
if ((rotateHint & legal) > 0)
return rotateHint;
// The hint wasn't legal, or it was zero
return hasMustRotate ? DEFAULT_MUST_ROTATE : DEFAULT_ROMAN;
}
// The small kana characters and Japanese punctuation that draw in the top right quadrant:
// small a, i, u, e, o, tsu, ya, yu, yo, wa (katakana only) ka ke
static final String sDrawsInTopRight =
"\u3041\u3043\u3045\u3047\u3049\u3063\u3083\u3085\u3087\u308E" + // hiragana
"\u30A1\u30A3\u30A5\u30A7\u30A9\u30C3\u30E3\u30E5\u30E7\u30EE\u30F5\u30F6"; // katakana
static final String sDrawsInFarTopRight = "\u3001\u3002"; // comma, full stop
static final int DEFAULT_CJK = ROTATE_NONE;
static final int LEGAL_ROMAN = ROTATE_NONE | ROTATE_LEFT | ROTATE_RIGHT;
static final int DEFAULT_ROMAN = ROTATE_RIGHT;
static final int LEGAL_MUST_ROTATE = ROTATE_LEFT | ROTATE_RIGHT;
static final int DEFAULT_MUST_ROTATE = ROTATE_LEFT;
static final double NINETY_DEGREES = Math.toRadians(90.0);
static final int kBufferSpace = 5;
}

110
java_console/romraider/src/com/romraider/swing/DefinitionManager.java
View File

@ -106,61 +106,61 @@ public class DefinitionManager extends javax.swing.JFrame implements ActionListe
btnUndo.setText("Undo"); btnUndo.setText("Undo");
// org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(getContentPane()); org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(getContentPane());
// getContentPane().setLayout(layout); getContentPane().setLayout(layout);
// layout.setHorizontalGroup( layout.setHorizontalGroup(
// layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
// .add(layout.createSequentialGroup() .add(layout.createSequentialGroup()
// .addContainerGap() .addContainerGap()
// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
// .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 448, Short.MAX_VALUE) .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 448, Short.MAX_VALUE)
// .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup() .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
// .add(layout.createSequentialGroup() .add(layout.createSequentialGroup()
// .add(btnSave) .add(btnSave)
// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
// .add(btnApply) .add(btnApply)
// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
// .add(btnUndo) .add(btnUndo)
// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
// .add(btnCancel)) .add(btnCancel))
// .add(layout.createSequentialGroup() .add(layout.createSequentialGroup()
// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
// .add(defLabel) .add(defLabel)
// .add(layout.createSequentialGroup() .add(layout.createSequentialGroup()
// .add(btnMoveDown) .add(btnMoveDown)
// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
// .add(btnMoveUp))) .add(btnMoveUp)))
// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 80, Short.MAX_VALUE) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 80, Short.MAX_VALUE)
// .add(btnAddDefinition))) .add(btnAddDefinition)))
// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
// .add(btnRemoveDefinition))) .add(btnRemoveDefinition)))
// .addContainerGap()) .addContainerGap())
// ); );
//
// layout.linkSize(new java.awt.Component[]{btnAddDefinition, btnMoveDown, btnMoveUp, btnRemoveDefinition}, org.jdesktop.layout.GroupLayout.HORIZONTAL); layout.linkSize(new java.awt.Component[]{btnAddDefinition, btnMoveDown, btnMoveUp, btnRemoveDefinition}, org.jdesktop.layout.GroupLayout.HORIZONTAL);
//
// layout.setVerticalGroup( layout.setVerticalGroup(
// layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
// .add(layout.createSequentialGroup() .add(layout.createSequentialGroup()
// .addContainerGap() .addContainerGap()
// .add(defLabel) .add(defLabel)
// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
// .add(jScrollPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) .add(jScrollPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
// .add(btnMoveUp) .add(btnMoveUp)
// .add(btnMoveDown) .add(btnMoveDown)
// .add(btnRemoveDefinition, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 23, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) .add(btnRemoveDefinition, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 23, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
// .add(btnAddDefinition)) .add(btnAddDefinition))
// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
// .add(btnSave) .add(btnSave)
// .add(btnApply) .add(btnApply)
// .add(btnUndo) .add(btnUndo)
// .add(btnCancel)) .add(btnCancel))
// .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
// ); );
pack(); pack();
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents

46
java_console/romraider/src/com/romraider/swing/ECUEditorMenuBar.java
View File

@ -21,7 +21,7 @@ package com.romraider.swing;
import static com.romraider.Version.ABOUT_ICON; import static com.romraider.Version.ABOUT_ICON;
import static com.romraider.Version.BUILDNUMBER; import static com.romraider.Version.BUILDNUMBER;
import static com.romraider.Version.ECU_DEFS_URL; //import static com.romraider.Version.ECU_DEFS_URL;
import static com.romraider.Version.PRODUCT_NAME; import static com.romraider.Version.PRODUCT_NAME;
import static com.romraider.Version.SUPPORT_URL; import static com.romraider.Version.SUPPORT_URL;
import static com.romraider.Version.VERSION; import static com.romraider.Version.VERSION;
@ -68,10 +68,10 @@ public class ECUEditorMenuBar extends JMenuBar implements ActionListener {
private final JMenuItem closeAll = new JMenuItem("Close All Images"); private final JMenuItem closeAll = new JMenuItem("Close All Images");
private final JMenuItem exit = new JMenuItem("Exit"); private final JMenuItem exit = new JMenuItem("Exit");
private final JMenu definitionMenu = new JMenu("ECU Definitions"); // private final JMenu definitionMenu = new JMenu("ECU Definitions");
private final JMenuItem defManager = new JMenuItem("ECU Definition Manager..."); // private final JMenuItem defManager = new JMenuItem("ECU Definition Manager...");
private final JMenuItem editDefinition = new JMenuItem("Edit ECU Definitions..."); // private final JMenuItem editDefinition = new JMenuItem("Edit ECU Definitions...");
private final JMenuItem updateDefinition = new JMenuItem("Get ECU Definitions..."); // private final JMenuItem updateDefinition = new JMenuItem("Get ECU Definitions...");
private final JMenu editMenu = new JMenu("Edit"); private final JMenu editMenu = new JMenu("Edit");
private final JMenuItem settings = new JMenuItem(PRODUCT_NAME + " Settings..."); private final JMenuItem settings = new JMenuItem(PRODUCT_NAME + " Settings...");
@ -167,17 +167,17 @@ public class ECUEditorMenuBar extends JMenuBar implements ActionListener {
convertGroup.add(convertIncrease); convertGroup.add(convertIncrease);
convertGroup.add(convertDecrease); convertGroup.add(convertDecrease);
// ecu def menu items // // ecu def menu items
add(definitionMenu); // add(definitionMenu);
definitionMenu.setMnemonic('D'); // definitionMenu.setMnemonic('D');
//
definitionMenu.add(defManager); // definitionMenu.add(defManager);
defManager.addActionListener(this); // defManager.addActionListener(this);
defManager.setMnemonic('D'); // defManager.setMnemonic('D');
//
definitionMenu.add(updateDefinition); // definitionMenu.add(updateDefinition);
updateDefinition.addActionListener(this); // updateDefinition.addActionListener(this);
updateDefinition.setMnemonic('U'); // updateDefinition.setMnemonic('U');
//definitionMenu.add(editDefinition); //definitionMenu.add(editDefinition);
//editDefinition.setMnemonic('E'); //editDefinition.setMnemonic('E');
@ -305,7 +305,7 @@ public class ECUEditorMenuBar extends JMenuBar implements ActionListener {
} }
openImages.setEnabled(false); openImages.setEnabled(false);
editDefinition.setEnabled(false); // editDefinition.setEnabled(false);
revalidate(); revalidate();
} }
@ -392,10 +392,10 @@ public class ECUEditorMenuBar extends JMenuBar implements ActionListener {
new DebugPanel(ex, getSettings().getSupportURL()), "Exception", ERROR_MESSAGE); new DebugPanel(ex, getSettings().getSupportURL()), "Exception", ERROR_MESSAGE);
} }
} else if (e.getSource() == defManager) { // } else if (e.getSource() == defManager) {
DefinitionManager form = new DefinitionManager(); // DefinitionManager form = new DefinitionManager();
form.setLocationRelativeTo(parent); // form.setLocationRelativeTo(parent);
form.setVisible(true); // form.setVisible(true);
} else if (e.getSource() == level1) { } else if (e.getSource() == level1) {
parent.setUserLevel(1); parent.setUserLevel(1);
@ -414,8 +414,8 @@ public class ECUEditorMenuBar extends JMenuBar implements ActionListener {
// } else if (e.getSource() == openLogger) { // } else if (e.getSource() == openLogger) {
// parent.launchLogger(); // parent.launchLogger();
} else if (e.getSource() == updateDefinition) { // } else if (e.getSource() == updateDefinition) {
BrowserControl.displayURL(ECU_DEFS_URL); // BrowserControl.displayURL(ECU_DEFS_URL);
// } else if (e.getSource() == launchRamTuneTestApp) { // } else if (e.getSource() == launchRamTuneTestApp) {
// RamTuneTestApp.startTestApp(DISPOSE_ON_CLOSE); // RamTuneTestApp.startTestApp(DISPOSE_ON_CLOSE);

96
java_console/romraider/src/com/romraider/util/RomServer.java
View File

@ -1,96 +0,0 @@
/*
* RomRaider Open-Source Tuning, Logging and Reflashing
* Copyright (C) 2006-2012 RomRaider.com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
package com.romraider.util;
import org.apache.log4j.Logger;
import static org.apache.log4j.Logger.getLogger;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.net.ServerSocket;
import java.net.Socket;
public final class RomServer {
private static final Logger LOGGER = getLogger(RomServer.class);
private static final String HOST = "localhost";
private static final int PORT = 50001;
public static boolean isRunning() {
try {
ServerSocket sock = new ServerSocket(PORT);
sock.close();
return false;
} catch (Exception ex) {
return true;
}
}
public static String waitForRom() throws IOException {
ServerSocket sock = new ServerSocket(PORT);
try {
return waitForRom(sock);
} finally {
sock.close();
}
}
public static void sendRomToOpenInstance(String rom) {
try {
Socket socket = new Socket(HOST, PORT);
OutputStream os = socket.getOutputStream();
try {
write(os, rom);
} finally {
socket.close();
}
} catch (Throwable e) {
LOGGER.error("Error occurred", e);
}
}
private static void write(OutputStream os, String rom) {
PrintWriter pw = new PrintWriter(os, true);
try {
pw.println(rom);
} finally {
pw.close();
}
}
private static String waitForRom(ServerSocket sock) throws IOException {
Socket client = sock.accept();
try {
return getRom(client);
} finally {
client.close();
}
}
private static String getRom(Socket client) throws IOException {
BufferedReader br = new BufferedReader(new InputStreamReader(client.getInputStream()));
try {
return br.readLine();
} finally {
br.close();
}
}
}

35
java_console/ui/src/com/rusefi/RomRaiderWrapper.java Normal file
View File

@ -0,0 +1,35 @@
package com.rusefi;
import com.romraider.Settings;
import com.romraider.editor.ecu.ECUEditor;
import com.romraider.swing.LookAndFeelManager;
import com.romraider.util.LogManager;
import com.romraider.util.SettingsManager;
import java.io.File;
import static com.romraider.editor.ecu.ECUEditorManager.getECUEditor;
/**
* (c) Andrey Belomutskiy 2013-2015
* 3/6/2015
*/
public class RomRaiderWrapper {
private static final String DEFINITION_FILE = "..\\firmware\\integration\\rusefi.xml";
public static void main(String[] args) {
Settings settings = SettingsManager.getSettings();
if (settings.getEcuDefinitionFiles().isEmpty())
settings.addEcuDefinitionFile(new File(DEFINITION_FILE));
LogManager.initDebugLogging();
LookAndFeelManager.initLookAndFeel();
ECUEditor editor = getECUEditor();
editor.initializeEditorUI();
}
}

1
java_console/ui/ui.iml
View File

@ -18,5 +18,6 @@
<orderEntry type="module" module-name="models" /> <orderEntry type="module" module-name="models" />
<orderEntry type="library" name="SteelSeries" level="project" /> <orderEntry type="library" name="SteelSeries" level="project" />
<orderEntry type="module" module-name="autotest" /> <orderEntry type="module" module-name="autotest" />
<orderEntry type="module" module-name="romraider" />
</component> </component>
</module> </module>