Skip to content
Snippets Groups Projects
Commit 04020791 authored by FrankR's avatar FrankR
Browse files

Merge remote-tracking branch 'remotes/origin/SimpleScene'

parents 25d15c5b 8e808f9d
Branches
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 5251 additions and 12 deletions
src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/WorldModelQueryRequest.java → src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/WorldModelQueryRequest.java
+ 2
− 2
View file @ 04020791
/**
*/
package ipos.project.DataModellntegration.iPos_Datamodel;
package ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit;
import org.eclipse.emf.ecore.EObject;
......@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
* <!-- end-user-doc -->
*
*
* @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getWorldModelQueryRequest()
* @see ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.IPosDevKitPackage#getWorldModelQueryRequest()
* @model
* @generated
*/
......
src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/WorldModelUpdateRequest.java → src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/WorldModelUpdateRequest.java
+ 2
− 2
View file @ 04020791
/**
*/
package ipos.project.DataModellntegration.iPos_Datamodel;
package ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit;
import org.eclipse.emf.ecore.EObject;
......@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
* <!-- end-user-doc -->
*
*
* @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getWorldModelUpdateRequest()
* @see ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.IPosDevKitPackage#getWorldModelUpdateRequest()
* @model
* @generated
*/
......
src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AgentRegistrationRequestImpl.java → src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/impl/AgentRegistrationRequestImpl.java
+ 4
− 4
View file @ 04020791
/**
*/
package ipos.project.DataModellntegration.iPos_Datamodel.impl;
package ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.impl;
import ipos.project.DataModellntegration.iPos_Datamodel.AgentRegistrationRequest;
import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
import ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.AgentRegistrationRequest;
import ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.IPosDevKitPackage;
import org.eclipse.emf.ecore.EClass;
......@@ -33,7 +33,7 @@ public class AgentRegistrationRequestImpl extends MinimalEObjectImpl.Container i
*/
@Override
protected EClass eStaticClass() {
return IPos_DatamodelPackage.Literals.AGENT_REGISTRATION_REQUEST;
return IPosDevKitPackage.Literals.AGENT_REGISTRATION_REQUEST;
}
} //AgentRegistrationRequestImpl
src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/impl/DataStorageQueryRequestImpl.java 0 → 100644
+ 166
− 0
View file @ 04020791
/**
*/
package ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.impl;
import ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.DataStorageQueryRequest;
import ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.IPosDevKitPackage;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Data Storage Query Request</b></em>'.
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
* </p>
* <ul>
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.impl.DataStorageQueryRequestImpl#getTrackingTaskId <em>Tracking Task Id</em>}</li>
* </ul>
*
* @generated
*/
public class DataStorageQueryRequestImpl extends MinimalEObjectImpl.Container implements DataStorageQueryRequest {
/**
* The default value of the '{@link #getTrackingTaskId() <em>Tracking Task Id</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getTrackingTaskId()
* @generated
* @ordered
*/
protected static final String TRACKING_TASK_ID_EDEFAULT = null;
/**
* The cached value of the '{@link #getTrackingTaskId() <em>Tracking Task Id</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getTrackingTaskId()
* @generated
* @ordered
*/
protected String trackingTaskId = TRACKING_TASK_ID_EDEFAULT;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected DataStorageQueryRequestImpl() {
super();
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
protected EClass eStaticClass() {
return IPosDevKitPackage.Literals.DATA_STORAGE_QUERY_REQUEST;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public String getTrackingTaskId() {
return trackingTaskId;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public void setTrackingTaskId(String newTrackingTaskId) {
String oldTrackingTaskId = trackingTaskId;
trackingTaskId = newTrackingTaskId;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET,
IPosDevKitPackage.DATA_STORAGE_QUERY_REQUEST__TRACKING_TASK_ID, oldTrackingTaskId, trackingTaskId));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case IPosDevKitPackage.DATA_STORAGE_QUERY_REQUEST__TRACKING_TASK_ID:
return getTrackingTaskId();
}
return super.eGet(featureID, resolve, coreType);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
case IPosDevKitPackage.DATA_STORAGE_QUERY_REQUEST__TRACKING_TASK_ID:
setTrackingTaskId((String) newValue);
return;
}
super.eSet(featureID, newValue);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public void eUnset(int featureID) {
switch (featureID) {
case IPosDevKitPackage.DATA_STORAGE_QUERY_REQUEST__TRACKING_TASK_ID:
setTrackingTaskId(TRACKING_TASK_ID_EDEFAULT);
return;
}
super.eUnset(featureID);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
case IPosDevKitPackage.DATA_STORAGE_QUERY_REQUEST__TRACKING_TASK_ID:
return TRACKING_TASK_ID_EDEFAULT == null ? trackingTaskId != null
: !TRACKING_TASK_ID_EDEFAULT.equals(trackingTaskId);
}
return super.eIsSet(featureID);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public String toString() {
if (eIsProxy())
return super.toString();
StringBuilder result = new StringBuilder(super.toString());
result.append(" (trackingTaskId: ");
result.append(trackingTaskId);
result.append(')');
return result.toString();
}
} //DataStorageQueryRequestImpl
src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/DataStorageRequestImpl.java → src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/impl/DataStorageRequestImpl.java
+ 4
− 4
View file @ 04020791
/**
*/
package ipos.project.DataModellntegration.iPos_Datamodel.impl;
package ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.impl;
import ipos.project.DataModellntegration.iPos_Datamodel.DataStorageRequest;
import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
import ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.DataStorageRequest;
import ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.IPosDevKitPackage;
import org.eclipse.emf.ecore.EClass;
......@@ -33,7 +33,7 @@ public class DataStorageRequestImpl extends MinimalEObjectImpl.Container impleme
*/
@Override
protected EClass eStaticClass() {
return IPos_DatamodelPackage.Literals.DATA_STORAGE_REQUEST;
return IPosDevKitPackage.Literals.DATA_STORAGE_REQUEST;
}
} //DataStorageRequestImpl
src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/impl/IPosBTEventImpl.java 0 → 100644
+ 156
− 0
View file @ 04020791
/**
*/
package ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.impl;
import ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.IPosBTEvent;
import ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.IPosDevKitPackage;
import java.util.Map;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>IPos BT Event</b></em>'.
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
* </p>
* <ul>
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.impl.IPosBTEventImpl#getRss <em>Rss</em>}</li>
* </ul>
*
* @generated
*/
public class IPosBTEventImpl extends IPosBeaconEventImpl implements IPosBTEvent {
/**
* The cached value of the '{@link #getRss() <em>Rss</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getRss()
* @generated
* @ordered
*/
protected Map<String, Double> rss;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected IPosBTEventImpl() {
super();
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
protected EClass eStaticClass() {
return IPosDevKitPackage.Literals.IPOS_BT_EVENT;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public Map<String, Double> getRss() {
return rss;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public void setRss(Map<String, Double> newRss) {
Map<String, Double> oldRss = rss;
rss = newRss;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, IPosDevKitPackage.IPOS_BT_EVENT__RSS, oldRss, rss));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case IPosDevKitPackage.IPOS_BT_EVENT__RSS:
return getRss();
}
return super.eGet(featureID, resolve, coreType);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
case IPosDevKitPackage.IPOS_BT_EVENT__RSS:
setRss((Map<String, Double>) newValue);
return;
}
super.eSet(featureID, newValue);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public void eUnset(int featureID) {
switch (featureID) {
case IPosDevKitPackage.IPOS_BT_EVENT__RSS:
setRss((Map<String, Double>) null);
return;
}
super.eUnset(featureID);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
case IPosDevKitPackage.IPOS_BT_EVENT__RSS:
return rss != null;
}
return super.eIsSet(featureID);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public String toString() {
if (eIsProxy())
return super.toString();
StringBuilder result = new StringBuilder(super.toString());
result.append(" (rss: ");
result.append(rss);
result.append(')');
return result.toString();
}
} //IPosBTEventImpl
src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/NetworkInterfaceImpl.java → src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/impl/IPosBarcodeEventImpl.java
+ 37
− 0
View file @ 04020791
/**
*/
package ipos.project.DataModellntegration.iPos_Datamodel.impl;
package ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.impl;
import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
import ipos.project.DataModellntegration.iPos_Datamodel.NetworkInterface;
import ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.IPosBarcodeEvent;
import ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.IPosDevKitPackage;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Network Interface</b></em>'.
* An implementation of the model object '<em><b>IPos Barcode Event</b></em>'.
* <!-- end-user-doc -->
*
* @generated
*/
public class NetworkInterfaceImpl extends MinimalEObjectImpl.Container implements NetworkInterface {
public class IPosBarcodeEventImpl extends IPosProximityEventImpl implements IPosBarcodeEvent {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected NetworkInterfaceImpl() {
protected IPosBarcodeEventImpl() {
super();
}
......@@ -33,7 +31,7 @@ public class NetworkInterfaceImpl extends MinimalEObjectImpl.Container implement
*/
@Override
protected EClass eStaticClass() {
return IPos_DatamodelPackage.Literals.NETWORK_INTERFACE;
return IPosDevKitPackage.Literals.IPOS_BARCODE_EVENT;
}
} //NetworkInterfaceImpl
} //IPosBarcodeEventImpl
src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AngularRateImpl.java → src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/impl/IPosUWBEventImpl.java
+ 37
− 0
View file @ 04020791
/**
*/
package ipos.project.DataModellntegration.iPos_Datamodel.impl;
package ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.impl;
import ipos.project.DataModellntegration.iPos_Datamodel.AngularRate;
import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
import ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.IPosDevKitPackage;
import ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.IPosUWBEvent;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Angular Rate</b></em>'.
* An implementation of the model object '<em><b>IPos UWB Event</b></em>'.
* <!-- end-user-doc -->
*
* @generated
*/
public class AngularRateImpl extends MinimalEObjectImpl.Container implements AngularRate {
public class IPosUWBEventImpl extends IPosBeaconEventImpl implements IPosUWBEvent {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected AngularRateImpl() {
protected IPosUWBEventImpl() {
super();
}
......@@ -33,7 +31,7 @@ public class AngularRateImpl extends MinimalEObjectImpl.Container implements Ang
*/
@Override
protected EClass eStaticClass() {
return IPos_DatamodelPackage.Literals.ANGULAR_RATE;
return IPosDevKitPackage.Literals.IPOS_UWB_EVENT;
}
} //AngularRateImpl
} //IPosUWBEventImpl
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment