You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by do...@apache.org on 2007/05/07 17:27:42 UTC
svn commit: r535901 - in
/felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd: ./
impl/ impl/nmea0183/ wrapper/
Author: donsez
Date: Mon May 7 08:27:41 2007
New Revision: 535901
URL: http://svn.apache.org/viewvc?view=rev&rev=535901
Log:
changes copyrights and ML
refactor wrapper package
add some comments
Added:
felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/
felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/AsciiWrapper.java
- copied, changed from r535881, felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/AsciiWrapper.java
felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/HexWrapper.java
- copied, changed from r535881, felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/HexWrapper.java
felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/Nmea0183Wrapper.java
- copied, changed from r535881, felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/nmea0183/Nmea0183Wrapper.java
Removed:
felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/AsciiWrapper.java
felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/HexWrapper.java
felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/nmea0183/
Modified:
felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/IOWrapper.java
felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/Activator.java
felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/HexString.java
felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/RXTXCmdImpl.java
Modified: felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/IOWrapper.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/IOWrapper.java?view=diff&rev=535901&r1=535900&r2=535901
==============================================================================
--- felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/IOWrapper.java (original)
+++ felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/IOWrapper.java Mon May 7 08:27:41 2007
@@ -1,31 +1,32 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+/*
+ * Copyright 2006 The Apache Software Foundation
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
*/
-/**
- * RXTX Command.
- * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
- */
+
package org.apache.felix.rxtx.cmd;
import java.text.ParseException;
import java.util.StringTokenizer;
+/**
+ * This interface defines a wrapper
+ * to parse messages to send to the serial port
+ * and to format byte arrays received from the serial port.
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
+ */
public interface IOWrapper {
byte[] parse(String string) throws ParseException;
byte[] parse(StringTokenizer st) throws ParseException;
Modified: felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/Activator.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/Activator.java?view=diff&rev=535901&r1=535900&r2=535901
==============================================================================
--- felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/Activator.java (original)
+++ felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/Activator.java Mon May 7 08:27:41 2007
@@ -1,25 +1,18 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+/*
+ * Copyright 2006 The Apache Software Foundation
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * RXTX Command.
- * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
package org.apache.felix.rxtx.cmd.impl;
@@ -36,7 +29,9 @@
import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceRegistration;
-
+/**
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
+ */
public class Activator implements BundleActivator {
private transient BundleContext m_context = null;
private transient Map m_commandServiceRegistration = null;
Modified: felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/HexString.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/HexString.java?view=diff&rev=535901&r1=535900&r2=535901
==============================================================================
--- felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/HexString.java (original)
+++ felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/HexString.java Mon May 7 08:27:41 2007
@@ -19,7 +19,7 @@
/**
* RXTX Command.
- * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
package org.apache.felix.rxtx.cmd.impl;
Modified: felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/RXTXCmdImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/RXTXCmdImpl.java?view=diff&rev=535901&r1=535900&r2=535901
==============================================================================
--- felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/RXTXCmdImpl.java (original)
+++ felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/RXTXCmdImpl.java Mon May 7 08:27:41 2007
@@ -1,26 +1,21 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+/*
+ * Copyright 2006 The Apache Software Foundation
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
*/
-/**
- * RXTX Command.
- * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
- */
+
package org.apache.felix.rxtx.cmd.impl;
import gnu.io.CommPortIdentifier;
@@ -45,6 +40,8 @@
import org.apache.felix.rxtx.cmd.IOWrapper;
+import org.apache.felix.rxtx.cmd.wrapper.AsciiWrapper;
+import org.apache.felix.rxtx.cmd.wrapper.HexWrapper;
import org.apache.felix.shell.Command;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -53,6 +50,7 @@
/**
* This class creates a shell command
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
public class RXTXCmdImpl implements Command, SerialPortEventListener,
BundleActivator {
Copied: felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/AsciiWrapper.java (from r535881, felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/AsciiWrapper.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/AsciiWrapper.java?view=diff&rev=535901&p1=felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/AsciiWrapper.java&r1=535881&p2=felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/AsciiWrapper.java&r2=535901
==============================================================================
--- felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/AsciiWrapper.java (original)
+++ felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/AsciiWrapper.java Mon May 7 08:27:41 2007
@@ -1,27 +1,25 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+/*
+ * Copyright 2006 The Apache Software Foundation
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
*/
/**
* RXTX Command.
- * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
-package org.apache.felix.rxtx.cmd.impl;
+package org.apache.felix.rxtx.cmd.wrapper;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Copied: felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/HexWrapper.java (from r535881, felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/HexWrapper.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/HexWrapper.java?view=diff&rev=535901&p1=felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/HexWrapper.java&r1=535881&p2=felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/HexWrapper.java&r2=535901
==============================================================================
--- felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/HexWrapper.java (original)
+++ felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/HexWrapper.java Mon May 7 08:27:41 2007
@@ -1,33 +1,33 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+/*
+ * Copyright 2006 The Apache Software Foundation
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
*/
+
/**
* RXTX Command.
- * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
-package org.apache.felix.rxtx.cmd.impl;
+package org.apache.felix.rxtx.cmd.wrapper;
import java.text.ParseException;
import java.util.StringTokenizer;
import org.apache.felix.rxtx.cmd.IOWrapper;
+import org.apache.felix.rxtx.cmd.impl.HexString;
public class HexWrapper implements IOWrapper {
Copied: felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/Nmea0183Wrapper.java (from r535881, felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/nmea0183/Nmea0183Wrapper.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/Nmea0183Wrapper.java?view=diff&rev=535901&p1=felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/nmea0183/Nmea0183Wrapper.java&r1=535881&p2=felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/Nmea0183Wrapper.java&r2=535901
==============================================================================
--- felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/impl/nmea0183/Nmea0183Wrapper.java (original)
+++ felix/sandbox/donsez/rxtx.cmd/src/main/java/org/apache/felix/rxtx/cmd/wrapper/Nmea0183Wrapper.java Mon May 7 08:27:41 2007
@@ -1,34 +1,26 @@
/*
- * RXTX Command
+ * Copyright 2006 The Apache Software Foundation
*
- * Copyright (C) 2005-2006 Didier Donsez (didier.donsez@ieee.org)
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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 Library General Public License for more details.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
- * You should have received a copy of the GNU Library General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Contact: Didier Donsez (didier.donsez@ieee.org)
- * Contributor(s):
- *
- **/
+ */
-package org.apache.felix.rxtx.cmd.impl.nmea0183;
+package org.apache.felix.rxtx.cmd.wrapper;
import java.text.ParseException;
import java.util.StringTokenizer;
import org.apache.felix.rxtx.cmd.IOWrapper;
-import org.apache.felix.rxtx.cmd.impl.AsciiWrapper;
public class Nmea0183Wrapper extends AsciiWrapper implements IOWrapper {