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

cleanup 

git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@231 38686702-15cf-42e4-a595-3071df8bf5ea
This commit is contained in:
kascade 2009-04-09 04:57:41 +00:00
parent 0b5ed27347
commit 4e5f6ba81f
9 changed files with 7 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/romraider/logger/aem/plugin/AemDataSource.java
View File

@ -46,7 +46,7 @@ public final class AemDataSource implements ExternalDataSource {
}
public Action getMenuAction(EcuLogger logger) {
throw new UnsupportedOperationException();
return null;
}
public void setPort(String port) {

3
src/com/romraider/logger/ecu/external/GenericDataSourceManager.java vendored
View File

@ -54,7 +54,8 @@ public final class GenericDataSourceManager implements ExternalDataSource {
}
public Action getMenuAction(EcuLogger logger) {
return new GenericPluginMenuAction(logger, this);
Action action = dataSource.getMenuAction(logger);
return action == null ? new GenericPluginMenuAction(logger, this) : action;
}
public synchronized void setPort(String port) {

7
src/com/romraider/logger/ecu/profile/xml/UserProfileHandler.java
View File

@ -30,17 +30,14 @@ import java.util.Map;
public final class UserProfileHandler extends DefaultHandler {
private static final String SELECTED = "selected";
private static final String TAG_SERIAL = "serial";
private static final String TAG_PARAMETER = "parameter";
private static final String TAG_SWITCH = "switch";
private static final String TAG_EXTERNAL = "external";
private static final String ATTR_PORT = "port";
private static final String ATTR_ID = "id";
private static final String ATTR_UNITS = "units";
private static final String ATTR_LIVE_DATA = "livedata";
private static final String ATTR_GRAPH = "graph";
private static final String ATTR_DASH = "dash";
private String serialPort;
private Map<String, UserProfileItem> params;
private Map<String, UserProfileItem> switches;
private Map<String, UserProfileItem> external;
@ -52,9 +49,7 @@ public final class UserProfileHandler extends DefaultHandler {
}
public void startElement(String uri, String localName, String qName, Attributes attributes) {
if (TAG_SERIAL.equals(qName)) {
serialPort = attributes.getValue(ATTR_PORT);
} else if (TAG_PARAMETER.equals(qName)) {
if (TAG_PARAMETER.equals(qName)) {
params.put(attributes.getValue(ATTR_ID), getUserProfileItem(attributes));
} else if (TAG_SWITCH.equals(qName)) {
switches.put(attributes.getValue(ATTR_ID), getUserProfileItem(attributes));

2
src/com/romraider/logger/innovate/lc1/plugin/Lc1DataSource.java
View File

@ -48,7 +48,7 @@ public final class Lc1DataSource implements ExternalDataSource {
}
public Action getMenuAction(EcuLogger logger) {
throw new UnsupportedOperationException();
return null;
}
public void setPort(String port) {

2
src/com/romraider/logger/innovate/lm1/plugin/Lm1DataSource.java
View File

@ -48,7 +48,7 @@ public final class Lm1DataSource implements ExternalDataSource {
}
public Action getMenuAction(EcuLogger logger) {
throw new UnsupportedOperationException();
return null;
}
public void setPort(String port) {

2
src/com/romraider/logger/plx/plugin/PlxDataSource.java
View File

@ -56,7 +56,7 @@ public final class PlxDataSource implements ExternalDataSource {
}
public Action getMenuAction(EcuLogger logger) {
throw new UnsupportedOperationException();
return null;
}
public void setPort(String port) {

28
src/com/romraider/util/Nameable.java
View File

@ -1,28 +0,0 @@
/*
* RomRaider Open-Source Tuning, Logging and Reflashing
* Copyright (C) 2006-2008 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;
public interface Nameable {
public void setName(String name);
public String getName();
}

141
src/com/romraider/util/NamedSet.java
View File

@ -1,141 +0,0 @@
/*
* RomRaider Open-Source Tuning, Logging and Reflashing
* Copyright (C) 2006-2008 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 com.romraider.util.exception.NameableNotFoundException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
public class NamedSet<T extends Nameable> implements Set<T>, Serializable {
private static final long serialVersionUID = 3700068171618250762L;
private final List<T> objects = new ArrayList<T>();
public boolean add(T n) {
for (int i = 0; i < objects.size(); i++) {
if (objects.get(i).getName().equalsIgnoreCase(n.getName())) {
objects.remove(i);
objects.add(i, n);
return false;
}
}
return objects.add(n);
}
public Nameable get(int i) {
return objects.get(i);
}
public Nameable get(String name) throws NameableNotFoundException {
for (Nameable object : objects) {
if (object.getName().equalsIgnoreCase(name)) return object;
}
throw new NameableNotFoundException(name);
}
public Nameable get(Nameable n) throws NameableNotFoundException {
return get(n.getName());
}
public int size() {
return objects.size();
}
public void remove(Nameable n) throws NameableNotFoundException {
remove(n.getName());
}
public void remove(String name) throws NameableNotFoundException {
for (int i = 0; i < objects.size(); i++) {
if (objects.get(i).getName().equalsIgnoreCase(name)) {
objects.remove(i);
return;
}
}
throw new NameableNotFoundException(name);
}
public boolean isEmpty() {
return objects.isEmpty();
}
public boolean contains(Object o) {
return objects.contains(o);
}
public Iterator<T> iterator() {
return objects.iterator();
}
public Object[] toArray() {
return objects.toArray();
}
public boolean remove(Object o) {
return objects.remove(o);
}
public boolean containsAll(Collection<?> c) {
return objects.containsAll(c);
}
public boolean addAll(Collection<? extends T> c) {
return objects.addAll(c);
}
public boolean retainAll(Collection<?> c) {
return objects.retainAll(c);
}
public boolean removeAll(Collection<?> c) {
return objects.removeAll(c);
}
public void clear() {
objects.clear();
}
public <T> T[] toArray(T[] a) {
return null;
}
public String toString() {
StringBuffer output = new StringBuffer();
for (Nameable object : objects) output.append(object).append("\n");
return output.toString();
}
public void move(int src, int dest) {
T t = objects.get(src);
objects.remove(t);
objects.add(dest, t);
}
public void moveBefore(T moving, T anchor) {
move(objects.indexOf(moving), objects.indexOf(anchor) - 1);
}
public int indexOf(T obj) {
return objects.indexOf(obj);
}
}

32
src/com/romraider/util/exception/NameableNotFoundException.java
View File

@ -1,32 +0,0 @@
/*
* RomRaider Open-Source Tuning, Logging and Reflashing
* Copyright (C) 2006-2008 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.exception;
public class NameableNotFoundException extends Exception {
private static final long serialVersionUID = -8462061030545068171L;
private String name;
public NameableNotFoundException(String name) {
super(name);
this.name = name;
}
}