Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-02-21 10:58:50 +0000
committerHenrik Rentz-Reichert2012-02-21 10:58:50 +0000
commitb4c2b9d7264a9f60c8da9b3bf6773c2e46177874 (patch)
tree740ac185af7848b950725bc1c54c167332a66505 /runtime
parent6cd16f0241598adb610c929a89addf7edef5c4ca (diff)
downloadorg.eclipse.etrice-b4c2b9d7264a9f60c8da9b3bf6773c2e46177874.tar.gz
org.eclipse.etrice-b4c2b9d7264a9f60c8da9b3bf6773c2e46177874.tar.xz
org.eclipse.etrice-b4c2b9d7264a9f60c8da9b3bf6773c2e46177874.zip
[modellib] re-generated
Diffstat (limited to 'runtime')
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java14
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java8
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/SocketClient.java4
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/ALogService.java12
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/InternalLogData.java10
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/Log.java12
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/ATimingService.java12
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimeout.java24
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimer.java24
9 files changed, 60 insertions, 60 deletions
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java b/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java
index 5e1106c73..439376b85 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java
@@ -6,12 +6,12 @@ package org.eclipse.etrice.modellib.Socket;
public class DSocketConfiguration {
- //--------------------- attributes
- protected String serverName;
- protected int portNumber;
- protected int protocol;
- protected boolean checkCookie;
- protected int mode;
+ /*--------------------- attributes ---------------------*/
+ String serverName;
+ int portNumber;
+ int protocol;
+ boolean checkCookie;
+ int mode;
//--------------------- attribute setters and getters
public void setServerName (String serverName) {
@@ -45,7 +45,7 @@ public class DSocketConfiguration {
return this.mode;
}
- //--------------------- operations
+ /*--------------------- operations ---------------------*/
// default constructor
public DSocketConfiguration() {
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java b/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java
index d2972a986..e83f566b8 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java
@@ -6,9 +6,9 @@ package org.eclipse.etrice.modellib.Socket;
public class DSocketData {
- //--------------------- attributes
- protected int size;
- protected String data;
+ /*--------------------- attributes ---------------------*/
+ int size;
+ String data;
//--------------------- attribute setters and getters
public void setSize (int size) {
@@ -24,7 +24,7 @@ public class DSocketData {
return this.data;
}
- //--------------------- operations
+ /*--------------------- operations ---------------------*/
// default constructor
public DSocketData() {
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/SocketClient.java b/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/SocketClient.java
index ea7c3b2eb..4376afc72 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/SocketClient.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/SocketClient.java
@@ -24,8 +24,8 @@ public class SocketClient extends ActorClassBase {
//--------------------- interface item IDs
public static final int IFITEM_fct = 1;
- //--------------------- attributes
- //--------------------- operations
+ /*--------------------- attributes ---------------------*/
+ /*--------------------- operations ---------------------*/
//--------------------- construction
public SocketClient(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/ALogService.java b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/ALogService.java
index 1f124a84a..839026c26 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/ALogService.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/ALogService.java
@@ -11,19 +11,19 @@ import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
import room.basic.service.logging.Log.*;
-//--------------------- begin user code
+/*--------------------- begin user code ---------------------*/
import java.io.*;
import java.util.*;
-//--------------------- end user code
+/*--------------------- end user code ---------------------*/
public class ALogService extends ActorClassBase {
- //--------------------- begin user code
+ /*--------------------- begin user code ---------------------*/
FileOutputStream file = null;
PrintStream p = null;
static long tStart = System.currentTimeMillis();
- //--------------------- end user code
+ /*--------------------- end user code ---------------------*/
//--------------------- ports
//--------------------- saps
@@ -33,8 +33,8 @@ public class ALogService extends ActorClassBase {
//--------------------- interface item IDs
public static final int IFITEM_log = 1;
- //--------------------- attributes
- //--------------------- operations
+ /*--------------------- attributes ---------------------*/
+ /*--------------------- operations ---------------------*/
public void destroyUser() {
if (p!= null) {
p.flush();
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/InternalLogData.java b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/InternalLogData.java
index 29e88a363..50084924b 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/InternalLogData.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/InternalLogData.java
@@ -6,10 +6,10 @@ package room.basic.service.logging;
public class InternalLogData {
- //--------------------- attributes
- protected String userString;
- protected String sender;
- protected long timeStamp;
+ /*--------------------- attributes ---------------------*/
+ String userString;
+ String sender;
+ long timeStamp;
//--------------------- attribute setters and getters
public void setUserString (String userString) {
@@ -31,7 +31,7 @@ public class InternalLogData {
return this.timeStamp;
}
- //--------------------- operations
+ /*--------------------- operations ---------------------*/
// default constructor
public InternalLogData() {
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/Log.java b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/Log.java
index efbb493f6..508c9c910 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/Log.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/Log.java
@@ -17,11 +17,11 @@ public class Log {
public static final int IN_internalLog = 3;
public static final int MSG_MAX = 4;
- //--------------------- begin user code
+ /*--------------------- begin user code ---------------------*/
public static final int LOG_LEVEL_LOW = 1;
public static final int LOG_LEVEL_MEDIUM = 2;
public static final int LOG_LEVEL_HIGH = 3;
- //--------------------- end user code
+ /*--------------------- end user code ---------------------*/
private static String messageStrings[] = {"MIN", "open","close","internalLog","MAX"};
@@ -103,10 +103,10 @@ public class Log {
// port class
static public class LogConjPort extends PortBase {
- //--------------------- begin user code
+ /*--------------------- begin user code ---------------------*/
static int logLevel=0;
InternalLogData d = new InternalLogData();
- //--------------------- end user code
+ /*--------------------- end user code ---------------------*/
// constructors
public LogConjPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
super(actor, name, localId, 0, addr, peerAddress);
@@ -135,8 +135,8 @@ public class Log {
}
}
- //--------------------- attributes
- //--------------------- operations
+ /*--------------------- attributes ---------------------*/
+ /*--------------------- operations ---------------------*/
public void setLogLevel(int l) {
logLevel=l;
if (logLevel > LOG_LEVEL_HIGH) logLevel=LOG_LEVEL_HIGH;
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/ATimingService.java b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/ATimingService.java
index f30bfda23..c5e038af3 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/ATimingService.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/ATimingService.java
@@ -12,18 +12,18 @@ import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
import room.basic.service.timing.PTimeout.*;
import room.basic.service.timing.PTimer.*;
-//--------------------- begin user code
+/*--------------------- begin user code ---------------------*/
import java.util.Timer;
-//--------------------- end user code
+/*--------------------- end user code ---------------------*/
public class ATimingService extends ActorClassBase {
- //--------------------- begin user code
+ /*--------------------- begin user code ---------------------*/
private Timer timerService = null;
private int taskCount = 0;
private static final int PURGE_LIMIT = 1000;
- //--------------------- end user code
+ /*--------------------- end user code ---------------------*/
//--------------------- ports
//--------------------- saps
@@ -35,8 +35,8 @@ public class ATimingService extends ActorClassBase {
public static final int IFITEM_timer = 1;
public static final int IFITEM_timeout = 2;
- //--------------------- attributes
- //--------------------- operations
+ /*--------------------- attributes ---------------------*/
+ /*--------------------- operations ---------------------*/
public void stop() {
System.out.println(toString() + "::stop()");
timerService.cancel();
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimeout.java b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimeout.java
index 7656628f2..edb57303a 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimeout.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimeout.java
@@ -7,9 +7,9 @@ import org.eclipse.etrice.runtime.java.messaging.Message;
import org.eclipse.etrice.runtime.java.modelbase.*;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-//--------------------- begin user code
+/*--------------------- begin user code ---------------------*/
import java.util.TimerTask;
-//--------------------- end user code
+/*--------------------- end user code ---------------------*/
public class PTimeout {
@@ -20,7 +20,7 @@ public class PTimeout {
public static final int IN_Kill = 3;
public static final int MSG_MAX = 4;
- //--------------------- begin user code
+ /*--------------------- begin user code ---------------------*/
static protected class FireTimeoutTask extends TimerTask {
private int time;
@@ -55,7 +55,7 @@ public class PTimeout {
this.id = id;
}
}
- //--------------------- end user code
+ /*--------------------- end user code ---------------------*/
private static String messageStrings[] = {"MIN", "timeoutTick", "Start","Kill","MAX"};
@@ -72,11 +72,11 @@ public class PTimeout {
// port class
static public class PTimeoutPort extends PortBase {
- //--------------------- begin user code
+ /*--------------------- begin user code ---------------------*/
private FireTimeoutTask task = null;
public TimerTask getTask() { return task; }
- //--------------------- end user code
+ /*--------------------- end user code ---------------------*/
// constructors
public PTimeoutPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
super(actor, name, localId, 0, addr, peerAddress);
@@ -127,8 +127,8 @@ public class PTimeout {
}
}
- //--------------------- attributes
- //--------------------- operations
+ /*--------------------- attributes ---------------------*/
+ /*--------------------- operations ---------------------*/
public void timeout(Integer id) {
//regular PortClass Operation timeout
DebuggingService.getInstance().addMessageAsyncOut(getAddress(),
@@ -186,10 +186,10 @@ public class PTimeout {
// port class
static public class PTimeoutConjPort extends PortBase {
- //--------------------- begin user code
+ /*--------------------- begin user code ---------------------*/
private int currentId = 0;
private boolean active = false;
- //--------------------- end user code
+ /*--------------------- end user code ---------------------*/
// constructors
public PTimeoutConjPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
super(actor, name, localId, 0, addr, peerAddress);
@@ -232,8 +232,8 @@ public class PTimeout {
}
}
- //--------------------- attributes
- //--------------------- operations
+ /*--------------------- attributes ---------------------*/
+ /*--------------------- operations ---------------------*/
// sent messages
public void Start(int time_ms) {
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimer.java b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimer.java
index 7eb3a2ea1..51f56c879 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimer.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimer.java
@@ -7,9 +7,9 @@ import org.eclipse.etrice.runtime.java.messaging.Message;
import org.eclipse.etrice.runtime.java.modelbase.*;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-//--------------------- begin user code
+/*--------------------- begin user code ---------------------*/
import java.util.TimerTask;
-//--------------------- end user code
+/*--------------------- end user code ---------------------*/
public class PTimer {
@@ -20,7 +20,7 @@ public class PTimer {
public static final int IN_Kill = 3;
public static final int MSG_MAX = 4;
- //--------------------- begin user code
+ /*--------------------- begin user code ---------------------*/
static protected class FireTimerTask extends TimerTask {
private int time;
@@ -55,7 +55,7 @@ public class PTimer {
this.id = id;
}
}
- //--------------------- end user code
+ /*--------------------- end user code ---------------------*/
private static String messageStrings[] = {"MIN", "timerTick", "Start","Kill","MAX"};
@@ -72,11 +72,11 @@ public class PTimer {
// port class
static public class PTimerPort extends PortBase {
- //--------------------- begin user code
+ /*--------------------- begin user code ---------------------*/
private FireTimerTask task = null;
public TimerTask getTask() { return task; }
- //--------------------- end user code
+ /*--------------------- end user code ---------------------*/
// constructors
public PTimerPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
super(actor, name, localId, 0, addr, peerAddress);
@@ -127,8 +127,8 @@ public class PTimer {
}
}
- //--------------------- attributes
- //--------------------- operations
+ /*--------------------- attributes ---------------------*/
+ /*--------------------- operations ---------------------*/
public void timer(Integer id) {
//regular PortClass Operation timer
DebuggingService.getInstance().addMessageAsyncOut(getAddress(),
@@ -186,10 +186,10 @@ public class PTimer {
// port class
static public class PTimerConjPort extends PortBase {
- //--------------------- begin user code
+ /*--------------------- begin user code ---------------------*/
private int currentId = 0;
private boolean active = false;
- //--------------------- end user code
+ /*--------------------- end user code ---------------------*/
// constructors
public PTimerConjPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
super(actor, name, localId, 0, addr, peerAddress);
@@ -231,8 +231,8 @@ public class PTimer {
}
}
- //--------------------- attributes
- //--------------------- operations
+ /*--------------------- attributes ---------------------*/
+ /*--------------------- operations ---------------------*/
// sent messages
public void Start(int time_ms) {

Back to the top