Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-03-15 07:55:42 +0000
committerHenrik Rentz-Reichert2012-03-15 07:55:42 +0000
commitb2561d69099e255d664d743a80bffa1519bf3c9c (patch)
tree395b6552cf9210f38ebceeaeafd157807f7f6c12
parent9ecaaf4085466277678b1db01375b11cd98d0bf5 (diff)
downloadorg.eclipse.etrice-b2561d69099e255d664d743a80bffa1519bf3c9c.tar.gz
org.eclipse.etrice-b2561d69099e255d664d743a80bffa1519bf3c9c.tar.xz
org.eclipse.etrice-b2561d69099e255d664d743a80bffa1519bf3c9c.zip
[ui.runtime, modellib] updated
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zipbin115886 -> 115874 bytes
-rw-r--r--runtime/org.eclipse.etrice.modellib/doc-gen/room.basic.types.java.tex140
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java5
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java2
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/ALogService.java4
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/InternalLogData.java3
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/ATimingService.java4
7 files changed, 74 insertions, 84 deletions
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
index 77fcd8eae..d935e2866 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
Binary files differ
diff --git a/runtime/org.eclipse.etrice.modellib/doc-gen/room.basic.types.java.tex b/runtime/org.eclipse.etrice.modellib/doc-gen/room.basic.types.java.tex
index b660211d1..6be85698e 100644
--- a/runtime/org.eclipse.etrice.modellib/doc-gen/room.basic.types.java.tex
+++ b/runtime/org.eclipse.etrice.modellib/doc-gen/room.basic.types.java.tex
@@ -1,70 +1,70 @@
-\documentclass[titlepage]{article}
-\usepackage{graphicx}
-\makeatletter
-\newcommand\level[1]{%
- \ifcase#1\relax\expandafter\chapter\or
- \expandafter\section\or
- \expandafter\subsection\or
- \expandafter\subsubsection\else
- \def\next{\@level{#1}}\expandafter\next
- \fi}
-
-\newcommand{\@level}[1]{%
-\@startsection{level#1}
- {#1}
- {\z@}%
- {-3.25ex\@plus -1ex \@minus -.2ex}%
- {1.5ex \@plus .2ex}%
- {\normalfont\normalsize\bfseries}}
-
-\newdimen\@leveldim
- \newdimen\@dotsdim
- {\normalfont\normalsize
- \sbox\z@{0}\global\@leveldim=\wd\z@
- \sbox\z@{.}\global\@dotsdim=\wd\z@
- }
-\newcounter{level4}[subsubsection]
- \@namedef{thelevel4}{\thesubsubsection.\arabic{level4}}
- \@namedef{level4mark}#1{}
- \def\l@section{\@dottedtocline{1}{0pt}{\dimexpr\@leveldim*4+\@dotsdim*1+6pt\relax}}
- \def\l@subsection{\@dottedtocline{2}{0pt}{\dimexpr\@leveldim*5+\@dotsdim*2+6pt\relax}}
- \def\l@subsubsection{\@dottedtocline{3}{0pt}{\dimexpr\@leveldim*6+\@dotsdim*3+6pt\relax}}
- \@namedef{l@level4}{\@dottedtocline{4}{0pt}{\dimexpr\@leveldim*7+\@dotsdim*4+6pt\relax}}
-
-\count@=4
- \def\@ncp#1{\number\numexpr\count@+#1\relax}
- \loop\ifnum\count@<100
- \begingroup\edef\x{\endgroup
- \noexpand\newcounter{level\@ncp{1}}[level\number\count@]
- \noexpand\@namedef{thelevel\@ncp{1}}{%
- \noexpand\@nameuse{thelevel\@ncp{0}}.\noexpand\arabic{level\@ncp{0}}}
- \noexpand\@namedef{level\@ncp{1}mark}####1{}%
- \noexpand\@namedef{l@level\@ncp{1}}%
- {\noexpand\@dottedtocline{\@ncp{1}}{0pt}{\the\dimexpr\@leveldim*\@ncp{5}+\@dotsdim*\@ncp{0}\relax}}}%
- \x
- \advance\count@\@ne
- \repeat
- \makeatother
- \setcounter{secnumdepth}{100}
- \setcounter{tocdepth}{100}
-
-
-\title{room.basic.types.java Modeldocumentation}
-\date{\today}
-\author{generated by eTrice}
-
-\begin{document}
-\pagestyle{plain}
-\maketitle
-\tableofcontents
-
-\newpage
-\listoffigures
-\newpage
-\section{Modeldescription}
-
-\section{Protocol Class Description}
-\section{Data Class Description}
-\section{Actor Class Description}
-
-\end{document}
+\documentclass[titlepage]{article}
+\usepackage{graphicx}
+\makeatletter
+\newcommand\level[1]{%
+ \ifcase#1\relax\expandafter\chapter\or
+ \expandafter\section\or
+ \expandafter\subsection\or
+ \expandafter\subsubsection\else
+ \def\next{\@level{#1}}\expandafter\next
+ \fi}
+
+\newcommand{\@level}[1]{%
+\@startsection{level#1}
+ {#1}
+ {\z@}%
+ {-3.25ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\normalsize\bfseries}}
+
+\newdimen\@leveldim
+ \newdimen\@dotsdim
+ {\normalfont\normalsize
+ \sbox\z@{0}\global\@leveldim=\wd\z@
+ \sbox\z@{.}\global\@dotsdim=\wd\z@
+ }
+\newcounter{level4}[subsubsection]
+ \@namedef{thelevel4}{\thesubsubsection.\arabic{level4}}
+ \@namedef{level4mark}#1{}
+ \def\l@section{\@dottedtocline{1}{0pt}{\dimexpr\@leveldim*4+\@dotsdim*1+6pt\relax}}
+ \def\l@subsection{\@dottedtocline{2}{0pt}{\dimexpr\@leveldim*5+\@dotsdim*2+6pt\relax}}
+ \def\l@subsubsection{\@dottedtocline{3}{0pt}{\dimexpr\@leveldim*6+\@dotsdim*3+6pt\relax}}
+ \@namedef{l@level4}{\@dottedtocline{4}{0pt}{\dimexpr\@leveldim*7+\@dotsdim*4+6pt\relax}}
+
+\count@=4
+ \def\@ncp#1{\number\numexpr\count@+#1\relax}
+ \loop\ifnum\count@<100
+ \begingroup\edef\x{\endgroup
+ \noexpand\newcounter{level\@ncp{1}}[level\number\count@]
+ \noexpand\@namedef{thelevel\@ncp{1}}{%
+ \noexpand\@nameuse{thelevel\@ncp{0}}.\noexpand\arabic{level\@ncp{0}}}
+ \noexpand\@namedef{level\@ncp{1}mark}####1{}%
+ \noexpand\@namedef{l@level\@ncp{1}}%
+ {\noexpand\@dottedtocline{\@ncp{1}}{0pt}{\the\dimexpr\@leveldim*\@ncp{5}+\@dotsdim*\@ncp{0}\relax}}}%
+ \x
+ \advance\count@\@ne
+ \repeat
+ \makeatother
+ \setcounter{secnumdepth}{100}
+ \setcounter{tocdepth}{100}
+
+
+\title{room.basic.types.java Modeldocumentation}
+\date{\today}
+\author{generated by eTrice}
+
+\begin{document}
+\pagestyle{plain}
+\maketitle
+\tableofcontents
+
+\newpage
+\listoffigures
+\newpage
+\section{Modeldescription}
+
+\section{Protocol Class Description}
+\section{Data Class Description}
+\section{Actor Class Description}
+
+\end{document}
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 439376b85..cf5a0c40c 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
@@ -52,11 +52,6 @@ public class DSocketConfiguration {
super();
// initialize attributes
- serverName = "";
- portNumber = 0;
- protocol = 0;
- checkCookie = false;
- mode = 0;
}
// constructor using fields
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 e83f566b8..02aef15f0 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
@@ -31,8 +31,6 @@ public class DSocketData {
super();
// initialize attributes
- size = 0;
- data = "";
}
// constructor using fields
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 9dc3b941b..9575ded18 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
@@ -106,9 +106,9 @@ public class ALogService extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_closed_TO_opened_BY_openlog(InterfaceItemBase ifitem, String fileName) {
Date d=new Date(tStart);
try{
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 50084924b..67f715a96 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
@@ -38,9 +38,6 @@ public class InternalLogData {
super();
// initialize attributes
- userString = "";
- sender = "";
- timeStamp = 0;
}
// constructor using fields
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 ad4195062..6aaf59624 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
@@ -104,12 +104,12 @@ public class ATimingService extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
protected void entry_Operational() {
// prepare
}
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__Operational() {
timerService = new Timer();
}

Back to the top