modification to the main file and Vehicle editor
commit to check brenda branch
new data
check out brenda
New vehicle editor
Python for Brenda
merge with master
remove road add file
no new data
This commit merges with latest vehicle editor by abdalla+brenda
Conflicts:
	output/random.trip.xml
	src/com/opentrafficsimulation/Main.java
	src/com/opentrafficsimulation/connector/utility/ConnecterConverter.java
	src/com/opentrafficsimulation/connector/utility/ConnectorType.java
	src/com/opentrafficsimulation/editor/MainEditor.java
	src/com/opentrafficsimulation/screen/simulation/SimulationScreen.java
	tools/sumolib/build/dailyBuildMSVC8.bat
	tools/sumolib/contributed/traci4j/.classpath
	tools/sumolib/contributed/traci4j/.settings/org.eclipse.jdt.ui.prefs
	tools/sumolib/contributed/traci4j/.settings/org.eclipse.ltk.core.refactoring.prefs
	tools/sumolib/contributed/traci4j/README
	tools/sumolib/contributed/traci4j/src/de/uniluebeck/itm/tcpip/FastStorage.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/Lane.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/SumoHttpRetriever.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/SumoTraciConnection.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/TraCIException.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/Vehicle.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/VehicleLifecycleObserver.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/protocol/BoundingBox.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/protocol/Command.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/protocol/Constants.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/protocol/Polygon.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/protocol/RequestMessage.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/protocol/ResponseContainer.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/protocol/ResponseMessage.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/protocol/RoadmapPosition.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/protocol/StatusResponse.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/protocol/StringList.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/query/ChangeEdgeStateQuery.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/query/ChangeVehicleStateQuery.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/query/CloseQuery.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/query/DomainQuery.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/query/MultiVehiclePositionQuery.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/query/Query.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/query/ReadVehicleVarQuery.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/query/RetrieveEdgeStateQuery.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/query/RoadmapQuery.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/query/SimStepQuery.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/query/SubscribeVehiclesLifecycle.java
	tools/sumolib/contributed/traci4j/src/it/polito/appeal/traci/query/VehicleQuery.java
	tools/sumolib/contributed/traci4j/test/java/it/polito/appeal/traci/FastStorageTest.java
	tools/sumolib/contributed/traci4j/test/java/it/polito/appeal/traci/QueryRoadsTest.java
	tools/sumolib/contributed/traci4j/test/java/it/polito/appeal/traci/TraCIServerTest.java
	tools/sumolib/contributed/traci4j/test/java/it/polito/appeal/traci/TraCITest.java
	tools/sumolib/contributed/traci4j/test/java/it/polito/appeal/traci/protocol/CommandTest.java
	tools/sumolib/contributed/traci4j/test/java/it/polito/appeal/traci/protocol/MessageTest.java
	tools/sumolib/contributed/trafficmodeler/.classpath
	tools/sumolib/contributed/trafficmodeler/.project
	tools/sumolib/contributed/trafficmodeler/.settings/org.eclipse.jdt.ui.prefs
	tools/sumolib/contributed/trafficmodeler/.settings/org.eclipse.ltk.core.refactoring.prefs
	tools/sumolib/contributed/trafficmodeler/.settings/org.eclipse.wst.validation.prefs
	tools/sumolib/contributed/trafficmodeler/.umlproject
	tools/sumolib/contributed/trafficmodeler/SUMOConfXML.jardesc
	tools/sumolib/contributed/trafficmodeler/javadoc.xml
	tools/sumolib/contributed/trafficmodeler/src/Main.java
	tools/sumolib/contributed/trafficmodeler/src/classes/Constants.java
	tools/sumolib/contributed/trafficmodeler/src/classes/Layer.java
	tools/sumolib/contributed/trafficmodeler/src/classes/Pair.java
	tools/sumolib/contributed/trafficmodeler/src/classes/Project.java
	tools/sumolib/contributed/trafficmodeler/src/classes/ProjectElement.java
	tools/sumolib/contributed/trafficmodeler/src/classes/TypeSelection.java
	tools/sumolib/contributed/trafficmodeler/src/enums/EditingMode.java
	tools/sumolib/contributed/trafficmodeler/src/enums/MotionRestriction.java
	tools/sumolib/contributed/trafficmodeler/src/enums/SchoolType.java
	tools/sumolib/contributed/trafficmodeler/src/enums/SelectionCount.java
	tools/sumolib/contributed/trafficmodeler/src/enums/SelectionType.java
	tools/sumolib/contributed/trafficmodeler/src/enums/ToolType.java
	tools/sumolib/contributed/trafficmodeler/src/enums/TrafficDefinitionLayerType.java
	tools/sumolib/contributed/trafficmodeler/src/helpers/ApplicationSettings.java
	tools/sumolib/contributed/trafficmodeler/src/helpers/Broadcaster.java
	tools/sumolib/contributed/trafficmodeler/src/helpers/CursorProvider.java
	tools/sumolib/contributed/trafficmodeler/src/helpers/DrawingHelper.java
	tools/sumolib/contributed/trafficmodeler/src/helpers/MultipleTripExpander.java
	tools/sumolib/contributed/trafficmodeler/src/helpers/RandomNumberProvider.java
	tools/sumolib/contributed/trafficmodeler/src/helpers/StreamGobbler.java
	tools/sumolib/contributed/trafficmodeler/src/helpers/TimeConverter.java
	tools/sumolib/contributed/trafficmodeler/src/interfaces/CurrentLayerChangedListener.java
	tools/sumolib/contributed/trafficmodeler/src/interfaces/DrawableElement.java
	tools/sumolib/contributed/trafficmodeler/src/interfaces/DrawableLayer.java
	tools/sumolib/contributed/trafficmodeler/src/interfaces/HandleListener.java
	tools/sumolib/contributed/trafficmodeler/src/interfaces/ModifiedCollectionListener.java
	tools/sumolib/contributed/trafficmodeler/src/interfaces/ProjectChangedListener.java
	tools/sumolib/contributed/trafficmodeler/src/interfaces/SelectableType.java
	tools/sumolib/contributed/trafficmodeler/src/interfaces/SelectionChangedListener.java
	tools/sumolib/contributed/trafficmodeler/src/roadnetwork/Edge.java
	tools/sumolib/contributed/trafficmodeler/src/roadnetwork/Junction.java
	tools/sumolib/contributed/trafficmodeler/src/roadnetwork/Lane.java
	tools/sumolib/contributed/trafficmodeler/src/roadnetwork/RoadNetwork.java
	tools/sumolib/contributed/trafficmodeler/src/roadnetwork/RoadNetworkElement.java
	tools/sumolib/contributed/trafficmodeler/src/shapes/AreaExt.java
	tools/sumolib/contributed/trafficmodeler/src/shapes/Ellipse2DExt.java
	tools/sumolib/contributed/trafficmodeler/src/shapes/Line2DExt.java
	tools/sumolib/contributed/trafficmodeler/src/shapes/Point2DExt.java
	tools/sumolib/contributed/trafficmodeler/src/shapes/Polygon2D.java
	tools/sumolib/contributed/trafficmodeler/src/shapes/PolygonIterator.java
	tools/sumolib/contributed/trafficmodeler/src/shapes/Rectangle2DExt.java
	tools/sumolib/contributed/trafficmodeler/src/simulation/Adult.java
	tools/sumolib/contributed/trafficmodeler/src/simulation/Child.java
	tools/sumolib/contributed/trafficmodeler/src/simulation/CustomComparator.java
	tools/sumolib/contributed/trafficmodeler/src/simulation/House.java
	tools/sumolib/contributed/trafficmodeler/src/simulation/JobType.java
	tools/sumolib/contributed/trafficmodeler/src/simulation/Person.java
	tools/sumolib/contributed/trafficmodeler/src/simulation/Route.java
	tools/sumolib/contributed/trafficmodeler/src/simulation/SUMOInstruction.java
	tools/sumolib/contributed/trafficmodeler/src/simulation/SUMOInstructionList.java
	tools/sumolib/contributed/trafficmodeler/src/simulation/Simulation.java
	tools/sumolib/contributed/trafficmodeler/src/simulation/SimulationExporter.java
	tools/sumolib/contributed/trafficmodeler/src/simulation/TrafficGenerator.java
	tools/sumolib/contributed/trafficmodeler/src/simulation/Trip.java
	tools/sumolib/contributed/trafficmodeler/src/simulation/VehicleType.java
	tools/sumolib/contributed/trafficmodeler/src/tdl/XMLHelpers.java
	tools/sumolib/contributed/trafficmodeler/src/trafficdefinition/Accident.java
	tools/sumolib/contributed/trafficmodeler/src/trafficdefinition/ActivityBasedTrafficDefinitionLayer.java
	tools/sumolib/contributed/trafficmodeler/src/trafficdefinition/AreaFlow.java
	tools/sumolib/contributed/trafficmodeler/src/trafficdefinition/Flow.java
	tools/sumolib/contributed/trafficmodeler/src/trafficdefinition/Handle.java
	tools/sumolib/contributed/trafficmodeler/src/trafficdefinition/HotSpot.java
	tools/sumolib/contributed/trafficmodeler/src/trafficdefinition/RandomTrafficDefinitionLayer.java
	tools/sumolib/contributed/trafficmodeler/src/trafficdefinition/School.java
	tools/sumolib/contributed/trafficmodeler/src/trafficdefinition/TrafficArea.java
	tools/sumolib/contributed/trafficmodeler/src/trafficdefinition/TrafficDefinitionElement.java
	tools/sumolib/contributed/trafficmodeler/src/trafficdefinition/TrafficDefinitionLayer.java
	tools/sumolib/contributed/trafficmodeler/src/trafficdefinition/UserDefinedTrafficDefinitionLayer.java
	tools/sumolib/contributed/trafficmodeler/src/ui/AffectedLanesTableModel.java
	tools/sumolib/contributed/trafficmodeler/src/ui/Display.java
	tools/sumolib/contributed/trafficmodeler/src/ui/ExportLayersTableModel.java
	tools/sumolib/contributed/trafficmodeler/src/ui/MainWindow.java
	tools/sumolib/contributed/trafficmodeler/src/ui/PnlLayers.java
	tools/sumolib/contributed/trafficmodeler/src/ui/PnlProperties.java
	tools/sumolib/contributed/trafficmodeler/src/ui/TypeSelectionTableModel.java
	tools/sumolib/contributed/trafficmodeler/src/ui/controls/JTrafficLayerTree.java
	tools/sumolib/contributed/trafficmodeler/src/ui/controls/JTrafficLayerTreeModel.java
	tools/sumolib/contributed/trafficmodeler/src/ui/controls/ProjectTreeCellRenderer.java
	tools/sumolib/contributed/trafficmodeler/src/ui/controls/SimTimeEdit.java
	tools/sumolib/contributed/trafficmodeler/src/ui/dialogs/DlgAddEditJobType.java
	tools/sumolib/contributed/trafficmodeler/src/ui/dialogs/DlgAddEditVehicleType.java
	tools/sumolib/contributed/trafficmodeler/src/ui/dialogs/DlgExportSimulation.java
	tools/sumolib/contributed/trafficmodeler/src/ui/dialogs/DlgManageJobTypes.java
	tools/sumolib/contributed/trafficmodeler/src/ui/dialogs/DlgManageVehicleTypes.java
	tools/sumolib/contributed/trafficmodeler/src/ui/dialogs/DlgNewProject.java
	tools/sumolib/contributed/trafficmodeler/src/ui/dialogs/DlgRandomLayerProperties.java
	tools/sumolib/contributed/trafficmodeler/src/ui/dialogs/DlgSelectTypes.java
	tools/sumolib/contributed/trafficmodeler/src/ui/dialogs/DlgSettings.java
	tools/sumolib/contributed/trafficmodeler/src/ui/filefilters/ProjectFileFilter.java
	tools/sumolib/contributed/trafficmodeler/src/ui/filefilters/SUMOFileFilter.java
	tools/sumolib/contributed/trafficmodeler/src/ui/filefilters/TDLFileFilter.java
	tools/sumolib/contributed/trafficmodeler/src/ui/propertypanels/PnlAccidentProperties.java
	tools/sumolib/contributed/trafficmodeler/src/ui/propertypanels/PnlAreaFlowProperties.java
	tools/sumolib/contributed/trafficmodeler/src/ui/propertypanels/PnlEdgeProperties.java
	tools/sumolib/contributed/trafficmodeler/src/ui/propertypanels/PnlFlowProperties.java
	tools/sumolib/contributed/trafficmodeler/src/ui/propertypanels/PnlHotSpotProperties.java
	tools/sumolib/contributed/trafficmodeler/src/ui/propertypanels/PnlJunctionProperties.java
	tools/sumolib/contributed/trafficmodeler/src/ui/propertypanels/PnlSchoolProperties.java
	tools/sumolib/contributed/trafficmodeler/src/ui/propertypanels/PnlTrafficAreaProperties.java
	tools/sumolib/projects/TLS-Evaluationsszenarien/data/000.dat
	tools/sumolib/projects/TLS-Evaluationsszenarien/data/001.dat
	tools/sumolib/projects/TLS-Evaluationsszenarien/data/002.dat
	tools/sumolib/projects/TLS-Evaluationsszenarien/data/003.dat
	tools/sumolib/projects/TLS-Evaluationsszenarien/sumoConfig/cross_sat/cross.out
	tools/sumolib/projects/TaxiFCD_Krieg/.project
	tools/sumolib/projects/TaxiFCD_Krieg/.pydevproject
	tools/sumolib/projects/TaxiFCD_Krieg/src/backup/BackupFolder.pyw
	tools/sumolib/trip/sumolib/__init__.pyc
	tools/sumolib/trip/sumolib/net/__init__.pyc
	tools/sumolib/trip/sumolib/net/connection.pyc
	tools/sumolib/trip/sumolib/net/edge.pyc
	tools/sumolib/trip/sumolib/net/lane.pyc
	tools/sumolib/trip/sumolib/net/node.pyc
	tools/sumolib/trip/sumolib/net/roundabout.pyc
	tools/sumolib/trip/sumolib/output/__init__.pyc
	tools/sumolib/trip/sumolib/output/dump.pyc
	tools/sumolib/trip/sumolib/output/inductionloop.pyc
	tools/sumolib/trip/sumolib/poi.pyc
vehicleVersion2
Merge remote-tracking branch 'origin/Jiayi1'

Conflicts:
	src/com/opentrafficsimulation/editor/road/RoadEditor.java
	src/com/opentrafficsimulation/utility/constants/AppConstants.java
	src/com/opentrafficsimulation/utility/content/AppText.java
Add validation for input values