diff --git a/IFCFACILITIESMGMTDOMAIN/IfcActionRequest.java b/IFCFACILITIESMGMTDOMAIN/IfcActionRequest.java new file mode 100644 index 00000000..38f55739 --- /dev/null +++ b/IFCFACILITIESMGMTDOMAIN/IfcActionRequest.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcActionRequest extends IfcControl + { + private string RequestID; + } +} diff --git a/IfcGeometricConstraintResource/IfcSolidOrShell.java b/IFCFACILITIESMGMTDOMAIN/IfcCondition.java similarity index 81% rename from IfcGeometricConstraintResource/IfcSolidOrShell.java rename to IFCFACILITIESMGMTDOMAIN/IfcCondition.java index f3d79769..9c9f8e4c 100644 --- a/IfcGeometricConstraintResource/IfcSolidOrShell.java +++ b/IFCFACILITIESMGMTDOMAIN/IfcCondition.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public interface IfcSolidOrShell + public class IfcCondition extends IfcGroup { } } diff --git a/IFCFACILITIESMGMTDOMAIN/IfcConditionCriterion.java b/IFCFACILITIESMGMTDOMAIN/IfcConditionCriterion.java new file mode 100644 index 00000000..974e7c80 --- /dev/null +++ b/IFCFACILITIESMGMTDOMAIN/IfcConditionCriterion.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcConditionCriterion extends IfcControl + { + private IfcConditionCriterionSelect Criterion; + private IfcDateTimeSelect CriterionDateTime; + } +} diff --git a/IfcExternalReferenceResource/IfcClassificationSelect.java b/IFCFACILITIESMGMTDOMAIN/IfcConditionCriterionSelect.java similarity index 80% rename from IfcExternalReferenceResource/IfcClassificationSelect.java rename to IFCFACILITIESMGMTDOMAIN/IfcConditionCriterionSelect.java index bb38d065..65481cc9 100644 --- a/IfcExternalReferenceResource/IfcClassificationSelect.java +++ b/IFCFACILITIESMGMTDOMAIN/IfcConditionCriterionSelect.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public interface IfcClassificationSelect + public interface IfcConditionCriterionSelect { } } diff --git a/IFCFACILITIESMGMTDOMAIN/IfcEquipmentStandard.java b/IFCFACILITIESMGMTDOMAIN/IfcEquipmentStandard.java new file mode 100644 index 00000000..e5a93cad --- /dev/null +++ b/IFCFACILITIESMGMTDOMAIN/IfcEquipmentStandard.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcEquipmentStandard extends IfcControl + { + } +} diff --git a/IFCFACILITIESMGMTDOMAIN/IfcFurnitureStandard.java b/IFCFACILITIESMGMTDOMAIN/IfcFurnitureStandard.java new file mode 100644 index 00000000..5522e6fb --- /dev/null +++ b/IFCFACILITIESMGMTDOMAIN/IfcFurnitureStandard.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcFurnitureStandard extends IfcControl + { + } +} diff --git a/IfcBuildingControlsDomain/IfcActuator.java b/IFCFACILITIESMGMTDOMAIN/IfcMove.java similarity index 68% rename from IfcBuildingControlsDomain/IfcActuator.java rename to IFCFACILITIESMGMTDOMAIN/IfcMove.java index 1a57c031..ed486ec1 100644 --- a/IfcBuildingControlsDomain/IfcActuator.java +++ b/IFCFACILITIESMGMTDOMAIN/IfcMove.java @@ -3,8 +3,10 @@ package buildingsmart.ifc { - public class IfcActuator extends IfcDistributionControlElement + public class IfcMove extends IfcTask { - private IfcActuatorTypeEnum PredefinedType; + private IfcSpatialStructureElement MoveFrom; + private IfcSpatialStructureElement MoveTo; + private string[] PunchList; } } diff --git a/IfcControlExtension/IfcPerformanceHistoryTypeEnum.java b/IFCFACILITIESMGMTDOMAIN/IfcOrderAction.java similarity index 73% rename from IfcControlExtension/IfcPerformanceHistoryTypeEnum.java rename to IFCFACILITIESMGMTDOMAIN/IfcOrderAction.java index faa34b55..d2d77065 100644 --- a/IfcControlExtension/IfcPerformanceHistoryTypeEnum.java +++ b/IFCFACILITIESMGMTDOMAIN/IfcOrderAction.java @@ -3,9 +3,8 @@ package buildingsmart.ifc { - public enum IfcPerformanceHistoryTypeEnum + public class IfcOrderAction extends IfcTask { - USERDEFINED, - NOTDEFINED, + private string ActionID; } } diff --git a/IFCFACILITIESMGMTDOMAIN/IfcPermit.java b/IFCFACILITIESMGMTDOMAIN/IfcPermit.java new file mode 100644 index 00000000..ad4f342e --- /dev/null +++ b/IFCFACILITIESMGMTDOMAIN/IfcPermit.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcPermit extends IfcControl + { + private string PermitID; + } +} diff --git a/IfcPropertyResource/IfcExtendedProperties.java b/IFCMATERIALPROPERTYRESOURCE/IfcExtendedMaterialProperties.java similarity index 67% rename from IfcPropertyResource/IfcExtendedProperties.java rename to IFCMATERIALPROPERTYRESOURCE/IfcExtendedMaterialProperties.java index f78b8b9f..913cfeec 100644 --- a/IfcPropertyResource/IfcExtendedProperties.java +++ b/IFCMATERIALPROPERTYRESOURCE/IfcExtendedMaterialProperties.java @@ -3,10 +3,10 @@ package buildingsmart.ifc { - public class IfcExtendedProperties extends IfcPropertyAbstraction + public class IfcExtendedMaterialProperties extends IfcMaterialProperties { - private string Name; + private IfcProperty[] ExtendedProperties; private string Description; - private IfcProperty[] Properties; + private string Name; } } diff --git a/IFCMATERIALPROPERTYRESOURCE/IfcFuelProperties.java b/IFCMATERIALPROPERTYRESOURCE/IfcFuelProperties.java new file mode 100644 index 00000000..355580bf --- /dev/null +++ b/IFCMATERIALPROPERTYRESOURCE/IfcFuelProperties.java @@ -0,0 +1,13 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcFuelProperties extends IfcMaterialProperties + { + private double CombustionTemperature; + private IfcRatioMeasure CarbonContent; + private double LowerHeatingValue; + private double HigherHeatingValue; + } +} diff --git a/IFCMATERIALPROPERTYRESOURCE/IfcGeneralMaterialProperties.java b/IFCMATERIALPROPERTYRESOURCE/IfcGeneralMaterialProperties.java new file mode 100644 index 00000000..8d444d47 --- /dev/null +++ b/IFCMATERIALPROPERTYRESOURCE/IfcGeneralMaterialProperties.java @@ -0,0 +1,12 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcGeneralMaterialProperties extends IfcMaterialProperties + { + private double MolecularWeight; + private IfcRatioMeasure Porosity; + private double MassDensity; + } +} diff --git a/IFCMATERIALPROPERTYRESOURCE/IfcHygroscopicMaterialProperties.java b/IFCMATERIALPROPERTYRESOURCE/IfcHygroscopicMaterialProperties.java new file mode 100644 index 00000000..2ac54629 --- /dev/null +++ b/IFCMATERIALPROPERTYRESOURCE/IfcHygroscopicMaterialProperties.java @@ -0,0 +1,14 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcHygroscopicMaterialProperties extends IfcMaterialProperties + { + private IfcRatioMeasure UpperVaporResistanceFactor; + private IfcRatioMeasure LowerVaporResistanceFactor; + private double IsothermalMoistureCapacity; + private double VaporPermeability; + private double MoistureDiffusivity; + } +} diff --git a/IFCMATERIALPROPERTYRESOURCE/IfcMaterialProperties.java b/IFCMATERIALPROPERTYRESOURCE/IfcMaterialProperties.java new file mode 100644 index 00000000..610c8ace --- /dev/null +++ b/IFCMATERIALPROPERTYRESOURCE/IfcMaterialProperties.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcMaterialProperties extends IfcBase + { + private IfcMaterial Material; + } +} diff --git a/IFCMATERIALPROPERTYRESOURCE/IfcMechanicalConcreteMaterialProperties.java b/IFCMATERIALPROPERTYRESOURCE/IfcMechanicalConcreteMaterialProperties.java new file mode 100644 index 00000000..3cece8c4 --- /dev/null +++ b/IFCMATERIALPROPERTYRESOURCE/IfcMechanicalConcreteMaterialProperties.java @@ -0,0 +1,15 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcMechanicalConcreteMaterialProperties extends IfcMechanicalMaterialProperties + { + private double CompressiveStrength; + private IfcLengthMeasure MaxAggregateSize; + private string AdmixturesDescription; + private string Workability; + private IfcRatioMeasure ProtectivePoreRatio; + private string WaterImpermeability; + } +} diff --git a/IFCMATERIALPROPERTYRESOURCE/IfcMechanicalMaterialProperties.java b/IFCMATERIALPROPERTYRESOURCE/IfcMechanicalMaterialProperties.java new file mode 100644 index 00000000..799e9cce --- /dev/null +++ b/IFCMATERIALPROPERTYRESOURCE/IfcMechanicalMaterialProperties.java @@ -0,0 +1,14 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcMechanicalMaterialProperties extends IfcMaterialProperties + { + private double DynamicViscosity; + private double YoungModulus; + private double ShearModulus; + private IfcRatioMeasure PoissonRatio; + private double ThermalExpansionCoefficient; + } +} diff --git a/IFCMATERIALPROPERTYRESOURCE/IfcMechanicalSteelMaterialProperties.java b/IFCMATERIALPROPERTYRESOURCE/IfcMechanicalSteelMaterialProperties.java new file mode 100644 index 00000000..8406f698 --- /dev/null +++ b/IFCMATERIALPROPERTYRESOURCE/IfcMechanicalSteelMaterialProperties.java @@ -0,0 +1,16 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcMechanicalSteelMaterialProperties extends IfcMechanicalMaterialProperties + { + private double YieldStress; + private double UltimateStress; + private IfcRatioMeasure UltimateStrain; + private double HardeningModule; + private double ProportionalStress; + private IfcRatioMeasure PlasticStrain; + private IfcRelaxation[] Relaxations; + } +} diff --git a/IFCMATERIALPROPERTYRESOURCE/IfcOpticalMaterialProperties.java b/IFCMATERIALPROPERTYRESOURCE/IfcOpticalMaterialProperties.java new file mode 100644 index 00000000..60501b14 --- /dev/null +++ b/IFCMATERIALPROPERTYRESOURCE/IfcOpticalMaterialProperties.java @@ -0,0 +1,18 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcOpticalMaterialProperties extends IfcMaterialProperties + { + private IfcRatioMeasure VisibleTransmittance; + private IfcRatioMeasure SolarTransmittance; + private IfcRatioMeasure ThermalIrTransmittance; + private IfcRatioMeasure ThermalIrEmissivityBack; + private IfcRatioMeasure ThermalIrEmissivityFront; + private IfcRatioMeasure VisibleReflectanceBack; + private IfcRatioMeasure VisibleReflectanceFront; + private IfcRatioMeasure SolarReflectanceFront; + private IfcRatioMeasure SolarReflectanceBack; + } +} diff --git a/IFCMATERIALPROPERTYRESOURCE/IfcProductsOfCombustionProperties.java b/IFCMATERIALPROPERTYRESOURCE/IfcProductsOfCombustionProperties.java new file mode 100644 index 00000000..ba9a9c34 --- /dev/null +++ b/IFCMATERIALPROPERTYRESOURCE/IfcProductsOfCombustionProperties.java @@ -0,0 +1,13 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcProductsOfCombustionProperties extends IfcMaterialProperties + { + private double SpecificHeatCapacity; + private IfcRatioMeasure N20Content; + private IfcRatioMeasure COContent; + private IfcRatioMeasure CO2Content; + } +} diff --git a/IFCMATERIALPROPERTYRESOURCE/IfcRelaxation.java b/IFCMATERIALPROPERTYRESOURCE/IfcRelaxation.java new file mode 100644 index 00000000..483ce120 --- /dev/null +++ b/IFCMATERIALPROPERTYRESOURCE/IfcRelaxation.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcRelaxation extends IfcBase + { + private IfcRatioMeasure RelaxationValue; + private IfcRatioMeasure InitialStress; + } +} diff --git a/IFCMATERIALPROPERTYRESOURCE/IfcThermalMaterialProperties.java b/IFCMATERIALPROPERTYRESOURCE/IfcThermalMaterialProperties.java new file mode 100644 index 00000000..29c93cfe --- /dev/null +++ b/IFCMATERIALPROPERTYRESOURCE/IfcThermalMaterialProperties.java @@ -0,0 +1,13 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcThermalMaterialProperties extends IfcMaterialProperties + { + private double SpecificHeatCapacity; + private double BoilingPoint; + private double FreezingPoint; + private double ThermalConductivity; + } +} diff --git a/IFCMATERIALPROPERTYRESOURCE/IfcWaterProperties.java b/IFCMATERIALPROPERTYRESOURCE/IfcWaterProperties.java new file mode 100644 index 00000000..01a8cea6 --- /dev/null +++ b/IFCMATERIALPROPERTYRESOURCE/IfcWaterProperties.java @@ -0,0 +1,16 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcWaterProperties extends IfcMaterialProperties + { + private BOOLEAN IsPotable; + private double Hardness; + private double AlkalinityConcentration; + private double AcidityConcentration; + private IfcRatioMeasure ImpuritiesContent; + private double PHLevel; + private IfcRatioMeasure DissolvedSolidsContent; + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcAngularDimension.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcAngularDimension.java new file mode 100644 index 00000000..a2d5afad --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcAngularDimension.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcAngularDimension extends IfcDimensionCurveDirectedCallout + { + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDiameterDimension.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDiameterDimension.java new file mode 100644 index 00000000..ce573881 --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDiameterDimension.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcDiameterDimension extends IfcDimensionCurveDirectedCallout + { + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionCalloutRelationship.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionCalloutRelationship.java new file mode 100644 index 00000000..27ed6695 --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionCalloutRelationship.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcDimensionCalloutRelationship extends IfcDraughtingCalloutRelationship + { + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionCurve.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionCurve.java new file mode 100644 index 00000000..075e6e81 --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionCurve.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcDimensionCurve extends IfcAnnotationCurveOccurrence + { + private IfcTerminatorSymbol[] AnnotatedBySymbols; + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionCurveDirectedCallout.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionCurveDirectedCallout.java new file mode 100644 index 00000000..9e0e54ca --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionCurveDirectedCallout.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcDimensionCurveDirectedCallout extends IfcDraughtingCallout + { + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionCurveTerminator.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionCurveTerminator.java new file mode 100644 index 00000000..b1bb1476 --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionCurveTerminator.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcDimensionCurveTerminator extends IfcTerminatorSymbol + { + private IfcDimensionExtentUsage Role; + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionExtentUsage.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionExtentUsage.java new file mode 100644 index 00000000..c3736b12 --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionExtentUsage.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public enum IfcDimensionExtentUsage + { + ORIGIN, + TARGET, + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionPair.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionPair.java new file mode 100644 index 00000000..204f7280 --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDimensionPair.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcDimensionPair extends IfcDraughtingCalloutRelationship + { + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDraughtingCallout.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDraughtingCallout.java new file mode 100644 index 00000000..053c8ded --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDraughtingCallout.java @@ -0,0 +1,12 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcDraughtingCallout extends IfcGeometricRepresentationItem + { + private IfcDraughtingCalloutElement[] Contents; + private IfcDraughtingCalloutRelationship[] IsRelatedFromCallout; + private IfcDraughtingCalloutRelationship[] IsRelatedToCallout; + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDraughtingCalloutElement.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDraughtingCalloutElement.java new file mode 100644 index 00000000..fcd32190 --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDraughtingCalloutElement.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public interface IfcDraughtingCalloutElement + { + } +} diff --git a/IfcMaterialResource/IfcMaterialProfileSet.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDraughtingCalloutRelationship.java similarity index 58% rename from IfcMaterialResource/IfcMaterialProfileSet.java rename to IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDraughtingCalloutRelationship.java index 335c5bfa..840fc7b0 100644 --- a/IfcMaterialResource/IfcMaterialProfileSet.java +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcDraughtingCalloutRelationship.java @@ -3,11 +3,11 @@ package buildingsmart.ifc { - public class IfcMaterialProfileSet extends IfcMaterialDefinition + public class IfcDraughtingCalloutRelationship extends IfcBase { private string Name; private string Description; - private IfcMaterialProfile[] MaterialProfiles; - private IfcCompositeProfileDef CompositeProfile; + private IfcDraughtingCallout RelatingDraughtingCallout; + private IfcDraughtingCallout RelatedDraughtingCallout; } } diff --git a/IfcDateTimeResource/IfcTaskDurationEnum.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcLinearDimension.java similarity index 72% rename from IfcDateTimeResource/IfcTaskDurationEnum.java rename to IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcLinearDimension.java index a08ab3b1..4dfe21c8 100644 --- a/IfcDateTimeResource/IfcTaskDurationEnum.java +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcLinearDimension.java @@ -3,10 +3,7 @@ package buildingsmart.ifc { - public enum IfcTaskDurationEnum + public class IfcLinearDimension extends IfcDimensionCurveDirectedCallout { - ELAPSEDTIME, - WORKTIME, - NOTDEFINED, } } diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcPreDefinedDimensionSymbol.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcPreDefinedDimensionSymbol.java new file mode 100644 index 00000000..2870b249 --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcPreDefinedDimensionSymbol.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcPreDefinedDimensionSymbol extends IfcPreDefinedSymbol + { + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcPreDefinedPointMarkerSymbol.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcPreDefinedPointMarkerSymbol.java new file mode 100644 index 00000000..94f19213 --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcPreDefinedPointMarkerSymbol.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcPreDefinedPointMarkerSymbol extends IfcPreDefinedSymbol + { + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcPreDefinedTerminatorSymbol.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcPreDefinedTerminatorSymbol.java new file mode 100644 index 00000000..dde56ccd --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcPreDefinedTerminatorSymbol.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcPreDefinedTerminatorSymbol extends IfcPreDefinedSymbol + { + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcProjectionCurve.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcProjectionCurve.java new file mode 100644 index 00000000..7e898de8 --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcProjectionCurve.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcProjectionCurve extends IfcAnnotationCurveOccurrence + { + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcRadiusDimension.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcRadiusDimension.java new file mode 100644 index 00000000..ceecff6d --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcRadiusDimension.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcRadiusDimension extends IfcDimensionCurveDirectedCallout + { + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcStructuredDimensionCallout.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcStructuredDimensionCallout.java new file mode 100644 index 00000000..af6aa5d4 --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcStructuredDimensionCallout.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcStructuredDimensionCallout extends IfcDraughtingCallout + { + } +} diff --git a/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcTerminatorSymbol.java b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcTerminatorSymbol.java new file mode 100644 index 00000000..4cfcfc99 --- /dev/null +++ b/IFCPRESENTATIONDIMENSIONINGRESOURCE/IfcTerminatorSymbol.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcTerminatorSymbol extends IfcAnnotationSymbolOccurrence + { + private IfcAnnotationCurveOccurrence AnnotatedCurve; + } +} diff --git a/IFCPROFILEPROPERTYRESOURCE/IfcGeneralProfileProperties.java b/IFCPROFILEPROPERTYRESOURCE/IfcGeneralProfileProperties.java new file mode 100644 index 00000000..ab028aa3 --- /dev/null +++ b/IFCPROFILEPROPERTYRESOURCE/IfcGeneralProfileProperties.java @@ -0,0 +1,14 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcGeneralProfileProperties extends IfcProfileProperties + { + private double PhysicalWeight; + private IfcLengthMeasure Perimeter; + private IfcLengthMeasure MinimumPlateThickness; + private IfcLengthMeasure MaximumPlateThickness; + private double CrossSectionArea; + } +} diff --git a/IfcProfileResource/IfcProfileProperties.java b/IFCPROFILEPROPERTYRESOURCE/IfcProfileProperties.java similarity index 74% rename from IfcProfileResource/IfcProfileProperties.java rename to IFCPROFILEPROPERTYRESOURCE/IfcProfileProperties.java index 44ac0131..259720b3 100644 --- a/IfcProfileResource/IfcProfileProperties.java +++ b/IFCPROFILEPROPERTYRESOURCE/IfcProfileProperties.java @@ -3,8 +3,9 @@ package buildingsmart.ifc { - public class IfcProfileProperties extends IfcExtendedProperties + public class IfcProfileProperties extends IfcBase { + private string ProfileName; private IfcProfileDef ProfileDefinition; } } diff --git a/IfcProfileResource/IfcReinforcementBarProperties.java b/IFCPROFILEPROPERTYRESOURCE/IfcReinforcementBarProperties.java similarity index 84% rename from IfcProfileResource/IfcReinforcementBarProperties.java rename to IFCPROFILEPROPERTYRESOURCE/IfcReinforcementBarProperties.java index e020c1a6..ac377c57 100644 --- a/IfcProfileResource/IfcReinforcementBarProperties.java +++ b/IFCPROFILEPROPERTYRESOURCE/IfcReinforcementBarProperties.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcReinforcementBarProperties extends IfcPreDefinedProperties + public class IfcReinforcementBarProperties extends IfcBase { private double TotalCrossSectionArea; private string SteelGrade; diff --git a/IfcProfileResource/IfcReinforcingBarRoleEnum.java b/IFCPROFILEPROPERTYRESOURCE/IfcReinforcingBarRoleEnum.java similarity index 96% rename from IfcProfileResource/IfcReinforcingBarRoleEnum.java rename to IFCPROFILEPROPERTYRESOURCE/IfcReinforcingBarRoleEnum.java index aae06c5d..08685e97 100644 --- a/IfcProfileResource/IfcReinforcingBarRoleEnum.java +++ b/IFCPROFILEPROPERTYRESOURCE/IfcReinforcingBarRoleEnum.java @@ -12,7 +12,6 @@ public enum IfcReinforcingBarRoleEnum PUNCHING, EDGE, RING, - ANCHORING, USERDEFINED, NOTDEFINED, } diff --git a/IfcProfileResource/IfcReinforcingBarSurfaceEnum.java b/IFCPROFILEPROPERTYRESOURCE/IfcReinforcingBarSurfaceEnum.java similarity index 100% rename from IfcProfileResource/IfcReinforcingBarSurfaceEnum.java rename to IFCPROFILEPROPERTYRESOURCE/IfcReinforcingBarSurfaceEnum.java diff --git a/IFCPROFILEPROPERTYRESOURCE/IfcRibPlateDirectionEnum.java b/IFCPROFILEPROPERTYRESOURCE/IfcRibPlateDirectionEnum.java new file mode 100644 index 00000000..7e39a759 --- /dev/null +++ b/IFCPROFILEPROPERTYRESOURCE/IfcRibPlateDirectionEnum.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public enum IfcRibPlateDirectionEnum + { + DIRECTION_X, + DIRECTION_Y, + } +} diff --git a/IFCPROFILEPROPERTYRESOURCE/IfcRibPlateProfileProperties.java b/IFCPROFILEPROPERTYRESOURCE/IfcRibPlateProfileProperties.java new file mode 100644 index 00000000..89a36f95 --- /dev/null +++ b/IFCPROFILEPROPERTYRESOURCE/IfcRibPlateProfileProperties.java @@ -0,0 +1,14 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcRibPlateProfileProperties extends IfcProfileProperties + { + private IfcLengthMeasure Thickness; + private IfcLengthMeasure RibHeight; + private IfcLengthMeasure RibWidth; + private IfcLengthMeasure RibSpacing; + private IfcRibPlateDirectionEnum Direction; + } +} diff --git a/IfcProfileResource/IfcSectionProperties.java b/IFCPROFILEPROPERTYRESOURCE/IfcSectionProperties.java similarity index 82% rename from IfcProfileResource/IfcSectionProperties.java rename to IFCPROFILEPROPERTYRESOURCE/IfcSectionProperties.java index fbb6c9b1..aba40fc2 100644 --- a/IfcProfileResource/IfcSectionProperties.java +++ b/IFCPROFILEPROPERTYRESOURCE/IfcSectionProperties.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcSectionProperties extends IfcPreDefinedProperties + public class IfcSectionProperties extends IfcBase { private IfcSectionTypeEnum SectionType; private IfcProfileDef StartProfile; diff --git a/IfcProfileResource/IfcSectionReinforcementProperties.java b/IFCPROFILEPROPERTYRESOURCE/IfcSectionReinforcementProperties.java similarity index 86% rename from IfcProfileResource/IfcSectionReinforcementProperties.java rename to IFCPROFILEPROPERTYRESOURCE/IfcSectionReinforcementProperties.java index eca7dac5..14d423e1 100644 --- a/IfcProfileResource/IfcSectionReinforcementProperties.java +++ b/IFCPROFILEPROPERTYRESOURCE/IfcSectionReinforcementProperties.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcSectionReinforcementProperties extends IfcPreDefinedProperties + public class IfcSectionReinforcementProperties extends IfcBase { private double LongitudinalStartPosition; private double LongitudinalEndPosition; diff --git a/IfcProfileResource/IfcSectionTypeEnum.java b/IFCPROFILEPROPERTYRESOURCE/IfcSectionTypeEnum.java similarity index 100% rename from IfcProfileResource/IfcSectionTypeEnum.java rename to IFCPROFILEPROPERTYRESOURCE/IfcSectionTypeEnum.java diff --git a/IFCPROFILEPROPERTYRESOURCE/IfcStructuralProfileProperties.java b/IFCPROFILEPROPERTYRESOURCE/IfcStructuralProfileProperties.java new file mode 100644 index 00000000..e963f728 --- /dev/null +++ b/IFCPROFILEPROPERTYRESOURCE/IfcStructuralProfileProperties.java @@ -0,0 +1,25 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcStructuralProfileProperties extends IfcGeneralProfileProperties + { + private double TorsionalConstantX; + private double MomentOfInertiaYZ; + private double MomentOfInertiaY; + private double MomentOfInertiaZ; + private double WarpingConstant; + private double ShearCentreZ; + private double ShearCentreY; + private double ShearDeformationAreaZ; + private double ShearDeformationAreaY; + private double MaximumSectionModulusY; + private double MinimumSectionModulusY; + private double MaximumSectionModulusZ; + private double MinimumSectionModulusZ; + private double TorsionalSectionModulus; + private double CentreOfGravityInX; + private double CentreOfGravityInY; + } +} diff --git a/IFCPROFILEPROPERTYRESOURCE/IfcStructuralSteelProfileProperties.java b/IFCPROFILEPROPERTYRESOURCE/IfcStructuralSteelProfileProperties.java new file mode 100644 index 00000000..2a476d6e --- /dev/null +++ b/IFCPROFILEPROPERTYRESOURCE/IfcStructuralSteelProfileProperties.java @@ -0,0 +1,13 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcStructuralSteelProfileProperties extends IfcStructuralProfileProperties + { + private double ShearAreaZ; + private double ShearAreaY; + private IfcRatioMeasure PlasticShapeFactorY; + private IfcRatioMeasure PlasticShapeFactorZ; + } +} diff --git a/IfcDateTimeResource/IfcDataOriginEnum.java b/IFCTIMESERIESRESOURCE/IfcDataOriginEnum.java similarity index 100% rename from IfcDateTimeResource/IfcDataOriginEnum.java rename to IFCTIMESERIESRESOURCE/IfcDataOriginEnum.java diff --git a/IfcDateTimeResource/IfcIrregularTimeSeries.java b/IFCTIMESERIESRESOURCE/IfcIrregularTimeSeries.java similarity index 100% rename from IfcDateTimeResource/IfcIrregularTimeSeries.java rename to IFCTIMESERIESRESOURCE/IfcIrregularTimeSeries.java diff --git a/IfcDateTimeResource/IfcIrregularTimeSeriesValue.java b/IFCTIMESERIESRESOURCE/IfcIrregularTimeSeriesValue.java similarity index 88% rename from IfcDateTimeResource/IfcIrregularTimeSeriesValue.java rename to IFCTIMESERIESRESOURCE/IfcIrregularTimeSeriesValue.java index 8d8721eb..ad55ebe0 100644 --- a/IfcDateTimeResource/IfcIrregularTimeSeriesValue.java +++ b/IFCTIMESERIESRESOURCE/IfcIrregularTimeSeriesValue.java @@ -5,7 +5,7 @@ { public class IfcIrregularTimeSeriesValue extends IfcBase { - private string TimeStamp; + private IfcDateTimeSelect TimeStamp; private IfcValue[] ListValues; } } diff --git a/IfcDateTimeResource/IfcRegularTimeSeries.java b/IFCTIMESERIESRESOURCE/IfcRegularTimeSeries.java similarity index 100% rename from IfcDateTimeResource/IfcRegularTimeSeries.java rename to IFCTIMESERIESRESOURCE/IfcRegularTimeSeries.java diff --git a/IfcDateTimeResource/IfcTimeSeries.java b/IFCTIMESERIESRESOURCE/IfcTimeSeries.java similarity index 76% rename from IfcDateTimeResource/IfcTimeSeries.java rename to IFCTIMESERIESRESOURCE/IfcTimeSeries.java index 2240e412..333995e4 100644 --- a/IfcDateTimeResource/IfcTimeSeries.java +++ b/IFCTIMESERIESRESOURCE/IfcTimeSeries.java @@ -7,12 +7,12 @@ public class IfcTimeSeries extends IfcBase { private string Name; private string Description; - private string StartTime; - private string EndTime; + private IfcDateTimeSelect StartTime; + private IfcDateTimeSelect EndTime; private IfcTimeSeriesDataTypeEnum TimeSeriesDataType; private IfcDataOriginEnum DataOrigin; private string UserDefinedDataOrigin; private IfcUnit Unit; - private IfcExternalReferenceRelationship[] HasExternalReference; + private IfcTimeSeriesReferenceRelationship[] DocumentedBy; } } diff --git a/IfcDateTimeResource/IfcTimeSeriesDataTypeEnum.java b/IFCTIMESERIESRESOURCE/IfcTimeSeriesDataTypeEnum.java similarity index 100% rename from IfcDateTimeResource/IfcTimeSeriesDataTypeEnum.java rename to IFCTIMESERIESRESOURCE/IfcTimeSeriesDataTypeEnum.java diff --git a/IfcConstructionMgmtDomain/IfcConstructionProductResourceType.java b/IFCTIMESERIESRESOURCE/IfcTimeSeriesReferenceRelationship.java similarity index 54% rename from IfcConstructionMgmtDomain/IfcConstructionProductResourceType.java rename to IFCTIMESERIESRESOURCE/IfcTimeSeriesReferenceRelationship.java index 30bea13c..12000115 100644 --- a/IfcConstructionMgmtDomain/IfcConstructionProductResourceType.java +++ b/IFCTIMESERIESRESOURCE/IfcTimeSeriesReferenceRelationship.java @@ -3,8 +3,9 @@ package buildingsmart.ifc { - public class IfcConstructionProductResourceType extends IfcConstructionResourceType + public class IfcTimeSeriesReferenceRelationship extends IfcBase { - private IfcConstructionProductResourceTypeEnum PredefinedType; + private IfcTimeSeries ReferencedTimeSeries; + private IfcDocumentSelect[] TimeSeriesReferences; } } diff --git a/IfcDateTimeResource/IfcTimeSeriesValue.java b/IFCTIMESERIESRESOURCE/IfcTimeSeriesValue.java similarity index 100% rename from IfcDateTimeResource/IfcTimeSeriesValue.java rename to IFCTIMESERIESRESOURCE/IfcTimeSeriesValue.java diff --git a/IfcActorResource/IfcActorRole.java b/IfcActorResource/IfcActorRole.java index 63f9e365..bec64e4d 100644 --- a/IfcActorResource/IfcActorRole.java +++ b/IfcActorResource/IfcActorRole.java @@ -8,6 +8,5 @@ public class IfcActorRole extends IfcBase private IfcRoleEnum Role; private string UserDefinedRole; private string Description; - private IfcExternalReferenceRelationship[] HasExternalReference; } } diff --git a/IfcActorResource/IfcOrganization.java b/IfcActorResource/IfcOrganization.java index e337a503..4ea4aeff 100644 --- a/IfcActorResource/IfcOrganization.java +++ b/IfcActorResource/IfcOrganization.java @@ -5,7 +5,7 @@ { public class IfcOrganization extends IfcBase { - private string Identification; + private string Id; private string Name; private string Description; private IfcActorRole[] Roles; diff --git a/IfcActorResource/IfcOrganizationRelationship.java b/IfcActorResource/IfcOrganizationRelationship.java index 46946d2b..34dc4dee 100644 --- a/IfcActorResource/IfcOrganizationRelationship.java +++ b/IfcActorResource/IfcOrganizationRelationship.java @@ -3,8 +3,10 @@ package buildingsmart.ifc { - public class IfcOrganizationRelationship extends IfcResourceLevelRelationship + public class IfcOrganizationRelationship extends IfcBase { + private string Name; + private string Description; private IfcOrganization RelatingOrganization; private IfcOrganization[] RelatedOrganizations; } diff --git a/IfcActorResource/IfcPerson.java b/IfcActorResource/IfcPerson.java index 0c2ac389..83d0fd97 100644 --- a/IfcActorResource/IfcPerson.java +++ b/IfcActorResource/IfcPerson.java @@ -5,7 +5,7 @@ { public class IfcPerson extends IfcBase { - private string Identification; + private string Id; private string FamilyName; private string GivenName; private string[] MiddleNames; diff --git a/IfcActorResource/IfcRoleEnum.java b/IfcActorResource/IfcRoleEnum.java index a88dd1f8..a2959025 100644 --- a/IfcActorResource/IfcRoleEnum.java +++ b/IfcActorResource/IfcRoleEnum.java @@ -20,7 +20,7 @@ public enum IfcRoleEnum PROJECTMANAGER, FACILITIESMANAGER, CIVILENGINEER, - COMMISSIONINGENGINEER, + COMISSIONINGENGINEER, ENGINEER, OWNER, CONSULTANT, diff --git a/IfcActorResource/IfcTelecomAddress.java b/IfcActorResource/IfcTelecomAddress.java index f2cdbe3f..8549ac1b 100644 --- a/IfcActorResource/IfcTelecomAddress.java +++ b/IfcActorResource/IfcTelecomAddress.java @@ -10,6 +10,5 @@ public class IfcTelecomAddress extends IfcAddress private string PagerNumber; private string[] ElectronicMailAddresses; private string WWWHomePageURL; - private string[] MessagingIDs; } } diff --git a/IfcApprovalResource/IfcApproval.java b/IfcApprovalResource/IfcApproval.java index 7615f262..e4467590 100644 --- a/IfcApprovalResource/IfcApproval.java +++ b/IfcApprovalResource/IfcApproval.java @@ -5,18 +5,14 @@ { public class IfcApproval extends IfcBase { - private string Identifier; - private string Name; private string Description; - private string TimeOfApproval; - private string Status; - private string Level; - private string Qualifier; - private IfcActorSelect RequestingApproval; - private IfcActorSelect GivingApproval; - private IfcExternalReferenceRelationship[] HasExternalReferences; - private IfcRelAssociatesApproval[] ApprovedObjects; - private IfcResourceApprovalRelationship[] ApprovedResources; + private IfcDateTimeSelect ApprovalDateTime; + private string ApprovalStatus; + private string ApprovalLevel; + private string ApprovalQualifier; + private string Name; + private string Identifier; + private IfcApprovalActorRelationship[] Actors; private IfcApprovalRelationship[] IsRelatedWith; private IfcApprovalRelationship[] Relates; } diff --git a/IfcApprovalResource/IfcApprovalActorRelationship.java b/IfcApprovalResource/IfcApprovalActorRelationship.java new file mode 100644 index 00000000..4690d19d --- /dev/null +++ b/IfcApprovalResource/IfcApprovalActorRelationship.java @@ -0,0 +1,12 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcApprovalActorRelationship extends IfcBase + { + private IfcActorSelect Actor; + private IfcApproval Approval; + private IfcActorRole Role; + } +} diff --git a/IfcApprovalResource/IfcApprovalPropertyRelationship.java b/IfcApprovalResource/IfcApprovalPropertyRelationship.java new file mode 100644 index 00000000..59863056 --- /dev/null +++ b/IfcApprovalResource/IfcApprovalPropertyRelationship.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcApprovalPropertyRelationship extends IfcBase + { + private IfcProperty[] ApprovedProperties; + private IfcApproval Approval; + } +} diff --git a/IfcApprovalResource/IfcApprovalRelationship.java b/IfcApprovalResource/IfcApprovalRelationship.java index f23df790..1efce214 100644 --- a/IfcApprovalResource/IfcApprovalRelationship.java +++ b/IfcApprovalResource/IfcApprovalRelationship.java @@ -3,9 +3,11 @@ package buildingsmart.ifc { - public class IfcApprovalRelationship extends IfcResourceLevelRelationship + public class IfcApprovalRelationship extends IfcBase { + private IfcApproval RelatedApproval; private IfcApproval RelatingApproval; - private IfcApproval[] RelatedApprovals; + private string Description; + private string Name; } } diff --git a/IfcArchitectureDomain/IfcPermeableCoveringProperties.java b/IfcArchitectureDomain/IfcPermeableCoveringProperties.java index 245f87fd..6f30a829 100644 --- a/IfcArchitectureDomain/IfcPermeableCoveringProperties.java +++ b/IfcArchitectureDomain/IfcPermeableCoveringProperties.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcPermeableCoveringProperties extends IfcPreDefinedPropertySet + public class IfcPermeableCoveringProperties extends IfcPropertySetDefinition { private IfcPermeableCoveringOperationEnum OperationType; private IfcWindowPanelPositionEnum PanelPosition; diff --git a/IfcArchitectureDomain/IfcRelInteractionRequirements.java b/IfcArchitectureDomain/IfcRelInteractionRequirements.java new file mode 100644 index 00000000..7a4542a3 --- /dev/null +++ b/IfcArchitectureDomain/IfcRelInteractionRequirements.java @@ -0,0 +1,14 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcRelInteractionRequirements extends IfcRelConnects + { + private NUMBER DailyInteraction; + private IfcRatioMeasure ImportanceRating; + private IfcSpatialStructureElement LocationOfInteraction; + private IfcSpaceProgram RelatedSpaceProgram; + private IfcSpaceProgram RelatingSpaceProgram; + } +} diff --git a/IfcArchitectureDomain/IfcSpaceProgram.java b/IfcArchitectureDomain/IfcSpaceProgram.java new file mode 100644 index 00000000..2bd8fc9a --- /dev/null +++ b/IfcArchitectureDomain/IfcSpaceProgram.java @@ -0,0 +1,16 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcSpaceProgram extends IfcControl + { + private string SpaceProgramIdentifier; + private double MaxRequiredArea; + private double MinRequiredArea; + private IfcSpatialStructureElement RequestedLocation; + private double StandardRequiredArea; + private IfcRelInteractionRequirements[] HasInteractionReqsFrom; + private IfcRelInteractionRequirements[] HasInteractionReqsTo; + } +} diff --git a/IfcBuildingControlsDomain/IfcControllerTypeEnum.java b/IfcBuildingControlsDomain/IfcControllerTypeEnum.java index 24f5f928..5d60aae5 100644 --- a/IfcBuildingControlsDomain/IfcControllerTypeEnum.java +++ b/IfcBuildingControlsDomain/IfcControllerTypeEnum.java @@ -6,9 +6,10 @@ public enum IfcControllerTypeEnum { FLOATING, - PROGRAMMABLE, PROPORTIONAL, - MULTIPOSITION, + PROPORTIONALINTEGRAL, + PROPORTIONALINTEGRALDERIVATIVE, + TIMEDTWOPOSITION, TWOPOSITION, USERDEFINED, NOTDEFINED, diff --git a/IfcBuildingControlsDomain/IfcSensorTypeEnum.java b/IfcBuildingControlsDomain/IfcSensorTypeEnum.java index 4afbc5ba..dc102c67 100644 --- a/IfcBuildingControlsDomain/IfcSensorTypeEnum.java +++ b/IfcBuildingControlsDomain/IfcSensorTypeEnum.java @@ -5,30 +5,19 @@ { public enum IfcSensorTypeEnum { - COSENSOR, CO2SENSOR, - CONDUCTANCESENSOR, - CONTACTSENSOR, FIRESENSOR, FLOWSENSOR, - FROSTSENSOR, GASSENSOR, HEATSENSOR, HUMIDITYSENSOR, - IDENTIFIERSENSOR, - IONCONCENTRATIONSENSOR, - LEVELSENSOR, LIGHTSENSOR, MOISTURESENSOR, MOVEMENTSENSOR, - PHSENSOR, PRESSURESENSOR, - RADIATIONSENSOR, - RADIOACTIVITYSENSOR, SMOKESENSOR, SOUNDSENSOR, TEMPERATURESENSOR, - WINDSENSOR, USERDEFINED, NOTDEFINED, } diff --git a/IfcBuildingControlsDomain/IfcUnitaryControlElement.java b/IfcBuildingControlsDomain/IfcUnitaryControlElement.java deleted file mode 100644 index da5da9e6..00000000 --- a/IfcBuildingControlsDomain/IfcUnitaryControlElement.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcUnitaryControlElement extends IfcDistributionControlElement - { - private IfcUnitaryControlElementTypeEnum PredefinedType; - } -} diff --git a/IfcBuildingControlsDomain/IfcUnitaryControlElementType.java b/IfcBuildingControlsDomain/IfcUnitaryControlElementType.java deleted file mode 100644 index 1e802c13..00000000 --- a/IfcBuildingControlsDomain/IfcUnitaryControlElementType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcUnitaryControlElementType extends IfcDistributionControlElementType - { - private IfcUnitaryControlElementTypeEnum PredefinedType; - } -} diff --git a/IfcConstraintResource/IfcBenchmarkEnum.java b/IfcConstraintResource/IfcBenchmarkEnum.java index 8bfd3b99..4c99f352 100644 --- a/IfcConstraintResource/IfcBenchmarkEnum.java +++ b/IfcConstraintResource/IfcBenchmarkEnum.java @@ -11,9 +11,5 @@ public enum IfcBenchmarkEnum LESSTHANOREQUALTO, EQUALTO, NOTEQUALTO, - INCLUDES, - NOTINCLUDES, - INCLUDEDIN, - NOTINCLUDEDIN, } } diff --git a/IfcConstraintResource/IfcConstraint.java b/IfcConstraintResource/IfcConstraint.java index 30ede75f..d98b826e 100644 --- a/IfcConstraintResource/IfcConstraint.java +++ b/IfcConstraintResource/IfcConstraint.java @@ -10,9 +10,13 @@ public class IfcConstraint extends IfcBase private IfcConstraintEnum ConstraintGrade; private string ConstraintSource; private IfcActorSelect CreatingActor; - private string CreationTime; + private IfcDateTimeSelect CreationTime; private string UserDefinedGrade; - private IfcExternalReferenceRelationship[] HasExternalReferences; - private IfcResourceConstraintRelationship[] PropertiesForConstraint; + private IfcConstraintClassificationRelationship[] ClassifiedAs; + private IfcConstraintRelationship[] RelatesConstraints; + private IfcConstraintRelationship[] IsRelatedWith; + private IfcPropertyConstraintRelationship[] PropertiesForConstraint; + private IfcConstraintAggregationRelationship[] Aggregates; + private IfcConstraintAggregationRelationship[] IsAggregatedIn; } } diff --git a/IfcConstraintResource/IfcConstraintAggregationRelationship.java b/IfcConstraintResource/IfcConstraintAggregationRelationship.java new file mode 100644 index 00000000..f7faaf2e --- /dev/null +++ b/IfcConstraintResource/IfcConstraintAggregationRelationship.java @@ -0,0 +1,14 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcConstraintAggregationRelationship extends IfcBase + { + private string Name; + private string Description; + private IfcConstraint RelatingConstraint; + private IfcConstraint[] RelatedConstraints; + private IfcLogicalOperatorEnum LogicalAggregator; + } +} diff --git a/IfcApprovalResource/IfcResourceApprovalRelationship.java b/IfcConstraintResource/IfcConstraintClassificationRelationship.java similarity index 51% rename from IfcApprovalResource/IfcResourceApprovalRelationship.java rename to IfcConstraintResource/IfcConstraintClassificationRelationship.java index 3e7379f1..b88c0559 100644 --- a/IfcApprovalResource/IfcResourceApprovalRelationship.java +++ b/IfcConstraintResource/IfcConstraintClassificationRelationship.java @@ -3,9 +3,9 @@ package buildingsmart.ifc { - public class IfcResourceApprovalRelationship extends IfcResourceLevelRelationship + public class IfcConstraintClassificationRelationship extends IfcBase { - private IfcResourceObjectSelect[] RelatedResourceObjects; - private IfcApproval RelatingApproval; + private IfcConstraint ClassifiedConstraint; + private IfcClassificationNotationSelect[] RelatedClassifications; } } diff --git a/IfcUtilityResource/IfcTableColumn.java b/IfcConstraintResource/IfcConstraintRelationship.java similarity index 63% rename from IfcUtilityResource/IfcTableColumn.java rename to IfcConstraintResource/IfcConstraintRelationship.java index 3d50e848..95bfa05e 100644 --- a/IfcUtilityResource/IfcTableColumn.java +++ b/IfcConstraintResource/IfcConstraintRelationship.java @@ -3,12 +3,11 @@ package buildingsmart.ifc { - public class IfcTableColumn extends IfcBase + public class IfcConstraintRelationship extends IfcBase { - private string Identifier; private string Name; private string Description; - private IfcUnit Unit; - private IfcReference ReferencePath; + private IfcConstraint RelatingConstraint; + private IfcConstraint[] RelatedConstraints; } } diff --git a/IfcConstraintResource/IfcLogicalOperatorEnum.java b/IfcConstraintResource/IfcLogicalOperatorEnum.java index 4f4650c1..f281bd02 100644 --- a/IfcConstraintResource/IfcLogicalOperatorEnum.java +++ b/IfcConstraintResource/IfcLogicalOperatorEnum.java @@ -7,8 +7,5 @@ public enum IfcLogicalOperatorEnum { LOGICALAND, LOGICALOR, - LOGICALXOR, - LOGICALNOTAND, - LOGICALNOTOR, } } diff --git a/IfcConstraintResource/IfcMetric.java b/IfcConstraintResource/IfcMetric.java index 20deff08..a7bdb736 100644 --- a/IfcConstraintResource/IfcMetric.java +++ b/IfcConstraintResource/IfcMetric.java @@ -8,6 +8,5 @@ public class IfcMetric extends IfcConstraint private IfcBenchmarkEnum Benchmark; private string ValueSource; private IfcMetricValueSelect DataValue; - private IfcReference ReferencePath; } } diff --git a/IfcConstraintResource/IfcObjective.java b/IfcConstraintResource/IfcObjective.java index 338c43d1..d095806b 100644 --- a/IfcConstraintResource/IfcObjective.java +++ b/IfcConstraintResource/IfcObjective.java @@ -5,8 +5,8 @@ { public class IfcObjective extends IfcConstraint { - private IfcConstraint[] BenchmarkValues; - private IfcLogicalOperatorEnum LogicalAggregator; + private IfcMetric BenchmarkValues; + private IfcMetric ResultValues; private IfcObjectiveEnum ObjectiveQualifier; private string UserDefinedQualifier; } diff --git a/IfcConstraintResource/IfcObjectiveEnum.java b/IfcConstraintResource/IfcObjectiveEnum.java index 5afd3e26..f92072e4 100644 --- a/IfcConstraintResource/IfcObjectiveEnum.java +++ b/IfcConstraintResource/IfcObjectiveEnum.java @@ -6,13 +6,8 @@ public enum IfcObjectiveEnum { CODECOMPLIANCE, - CODEWAIVER, DESIGNINTENT, - EXTERNAL, HEALTHANDSAFETY, - MERGECONFLICT, - MODELVIEW, - PARAMETER, REQUIREMENT, SPECIFICATION, TRIGGERCONDITION, diff --git a/IfcExternalReferenceResource/IfcResourceLevelRelationship.java b/IfcConstraintResource/IfcPropertyConstraintRelationship.java similarity index 62% rename from IfcExternalReferenceResource/IfcResourceLevelRelationship.java rename to IfcConstraintResource/IfcPropertyConstraintRelationship.java index 804480bd..76d921bf 100644 --- a/IfcExternalReferenceResource/IfcResourceLevelRelationship.java +++ b/IfcConstraintResource/IfcPropertyConstraintRelationship.java @@ -3,8 +3,10 @@ package buildingsmart.ifc { - public class IfcResourceLevelRelationship extends IfcBase + public class IfcPropertyConstraintRelationship extends IfcBase { + private IfcConstraint RelatingConstraint; + private IfcProperty[] RelatedProperties; private string Name; private string Description; } diff --git a/IfcConstraintResource/IfcReference.java b/IfcConstraintResource/IfcReference.java deleted file mode 100644 index 30d3446a..00000000 --- a/IfcConstraintResource/IfcReference.java +++ /dev/null @@ -1,14 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcReference extends IfcBase - { - private string TypeIdentifier; - private string AttributeIdentifier; - private string InstanceName; - private int[] ListPositions; - private IfcReference InnerReference; - } -} diff --git a/IfcConstraintResource/IfcResourceConstraintRelationship.java b/IfcConstraintResource/IfcResourceConstraintRelationship.java deleted file mode 100644 index f9e25a60..00000000 --- a/IfcConstraintResource/IfcResourceConstraintRelationship.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcResourceConstraintRelationship extends IfcResourceLevelRelationship - { - private IfcConstraint RelatingConstraint; - private IfcResourceObjectSelect[] RelatedResourceObjects; - } -} diff --git a/IfcConstructionMgmtDomain/IfcConstructionEquipmentResource.java b/IfcConstructionMgmtDomain/IfcConstructionEquipmentResource.java index d6cfd136..28ef8342 100644 --- a/IfcConstructionMgmtDomain/IfcConstructionEquipmentResource.java +++ b/IfcConstructionMgmtDomain/IfcConstructionEquipmentResource.java @@ -5,6 +5,5 @@ { public class IfcConstructionEquipmentResource extends IfcConstructionResource { - private IfcConstructionEquipmentResourceTypeEnum PredefinedType; } } diff --git a/IfcConstructionMgmtDomain/IfcConstructionEquipmentResourceType.java b/IfcConstructionMgmtDomain/IfcConstructionEquipmentResourceType.java deleted file mode 100644 index 63ba01e8..00000000 --- a/IfcConstructionMgmtDomain/IfcConstructionEquipmentResourceType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcConstructionEquipmentResourceType extends IfcConstructionResourceType - { - private IfcConstructionEquipmentResourceTypeEnum PredefinedType; - } -} diff --git a/IfcConstructionMgmtDomain/IfcConstructionEquipmentResourceTypeEnum.java b/IfcConstructionMgmtDomain/IfcConstructionEquipmentResourceTypeEnum.java deleted file mode 100644 index 644b036f..00000000 --- a/IfcConstructionMgmtDomain/IfcConstructionEquipmentResourceTypeEnum.java +++ /dev/null @@ -1,19 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcConstructionEquipmentResourceTypeEnum - { - DEMOLISHING, - EARTHMOVING, - ERECTING, - HEATING, - LIGHTING, - PAVING, - PUMPING, - TRANSPORTING, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcConstructionMgmtDomain/IfcConstructionMaterialResource.java b/IfcConstructionMgmtDomain/IfcConstructionMaterialResource.java index 302d885f..1f44623c 100644 --- a/IfcConstructionMgmtDomain/IfcConstructionMaterialResource.java +++ b/IfcConstructionMgmtDomain/IfcConstructionMaterialResource.java @@ -5,6 +5,7 @@ { public class IfcConstructionMaterialResource extends IfcConstructionResource { - private IfcConstructionMaterialResourceTypeEnum PredefinedType; + private IfcActorSelect[] Suppliers; + private double UsageRatio; } } diff --git a/IfcConstructionMgmtDomain/IfcConstructionMaterialResourceType.java b/IfcConstructionMgmtDomain/IfcConstructionMaterialResourceType.java deleted file mode 100644 index 83520498..00000000 --- a/IfcConstructionMgmtDomain/IfcConstructionMaterialResourceType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcConstructionMaterialResourceType extends IfcConstructionResourceType - { - private IfcConstructionMaterialResourceTypeEnum PredefinedType; - } -} diff --git a/IfcConstructionMgmtDomain/IfcConstructionMaterialResourceTypeEnum.java b/IfcConstructionMgmtDomain/IfcConstructionMaterialResourceTypeEnum.java deleted file mode 100644 index 4275b9c4..00000000 --- a/IfcConstructionMgmtDomain/IfcConstructionMaterialResourceTypeEnum.java +++ /dev/null @@ -1,20 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcConstructionMaterialResourceTypeEnum - { - AGGREGATES, - CONCRETE, - DRYWALL, - FUEL, - GYPSUM, - MASONRY, - METAL, - PLASTIC, - WOOD, - NOTDEFINED, - USERDEFINED, - } -} diff --git a/IfcConstructionMgmtDomain/IfcConstructionProductResource.java b/IfcConstructionMgmtDomain/IfcConstructionProductResource.java index 2e669fdb..44386071 100644 --- a/IfcConstructionMgmtDomain/IfcConstructionProductResource.java +++ b/IfcConstructionMgmtDomain/IfcConstructionProductResource.java @@ -5,6 +5,5 @@ { public class IfcConstructionProductResource extends IfcConstructionResource { - private IfcConstructionProductResourceTypeEnum PredefinedType; } } diff --git a/IfcConstructionMgmtDomain/IfcConstructionResource.java b/IfcConstructionMgmtDomain/IfcConstructionResource.java index 21a7ccd7..04beb605 100644 --- a/IfcConstructionMgmtDomain/IfcConstructionResource.java +++ b/IfcConstructionMgmtDomain/IfcConstructionResource.java @@ -5,8 +5,9 @@ { public class IfcConstructionResource extends IfcResource { - private IfcResourceTime Usage; - private IfcAppliedValue[] BaseCosts; - private IfcPhysicalQuantity BaseQuantity; + private string ResourceIdentifier; + private string ResourceGroup; + private IfcResourceConsumptionEnum ResourceConsumption; + private IfcMeasureWithUnit BaseQuantity; } } diff --git a/IfcConstructionMgmtDomain/IfcCrewResource.java b/IfcConstructionMgmtDomain/IfcCrewResource.java index 5d0ae646..300c2568 100644 --- a/IfcConstructionMgmtDomain/IfcCrewResource.java +++ b/IfcConstructionMgmtDomain/IfcCrewResource.java @@ -5,6 +5,5 @@ { public class IfcCrewResource extends IfcConstructionResource { - private IfcCrewResourceTypeEnum PredefinedType; } } diff --git a/IfcConstructionMgmtDomain/IfcCrewResourceType.java b/IfcConstructionMgmtDomain/IfcCrewResourceType.java deleted file mode 100644 index d40cc4bf..00000000 --- a/IfcConstructionMgmtDomain/IfcCrewResourceType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCrewResourceType extends IfcConstructionResourceType - { - private IfcCrewResourceTypeEnum PredefinedType; - } -} diff --git a/IfcConstructionMgmtDomain/IfcLaborResource.java b/IfcConstructionMgmtDomain/IfcLaborResource.java index 743cc173..31a89499 100644 --- a/IfcConstructionMgmtDomain/IfcLaborResource.java +++ b/IfcConstructionMgmtDomain/IfcLaborResource.java @@ -5,6 +5,6 @@ { public class IfcLaborResource extends IfcConstructionResource { - private IfcLaborResourceTypeEnum PredefinedType; + private string SkillSet; } } diff --git a/IfcConstructionMgmtDomain/IfcLaborResourceType.java b/IfcConstructionMgmtDomain/IfcLaborResourceType.java deleted file mode 100644 index c02b2f58..00000000 --- a/IfcConstructionMgmtDomain/IfcLaborResourceType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcLaborResourceType extends IfcConstructionResourceType - { - private IfcLaborResourceTypeEnum PredefinedType; - } -} diff --git a/IfcConstructionMgmtDomain/IfcLaborResourceTypeEnum.java b/IfcConstructionMgmtDomain/IfcLaborResourceTypeEnum.java deleted file mode 100644 index 32bfbaf7..00000000 --- a/IfcConstructionMgmtDomain/IfcLaborResourceTypeEnum.java +++ /dev/null @@ -1,30 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcLaborResourceTypeEnum - { - ADMINISTRATION, - CARPENTRY, - CLEANING, - CONCRETE, - DRYWALL, - ELECTRIC, - FINISHING, - FLOORING, - GENERAL, - HVAC, - LANDSCAPING, - MASONRY, - PAINTING, - PAVING, - PLUMBING, - ROOFING, - SITEGRADING, - STEELWORK, - SURVEYING, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcConstructionMgmtDomain/IfcResourceConsumptionEnum.java b/IfcConstructionMgmtDomain/IfcResourceConsumptionEnum.java new file mode 100644 index 00000000..955f4fab --- /dev/null +++ b/IfcConstructionMgmtDomain/IfcResourceConsumptionEnum.java @@ -0,0 +1,17 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public enum IfcResourceConsumptionEnum + { + CONSUMED, + PARTIALLYCONSUMED, + NOTCONSUMED, + OCCUPIED, + PARTIALLYOCCUPIED, + NOTOCCUPIED, + USERDEFINED, + NOTDEFINED, + } +} diff --git a/IfcConstructionMgmtDomain/IfcSubContractResource.java b/IfcConstructionMgmtDomain/IfcSubContractResource.java index 1404448a..85648c59 100644 --- a/IfcConstructionMgmtDomain/IfcSubContractResource.java +++ b/IfcConstructionMgmtDomain/IfcSubContractResource.java @@ -5,6 +5,7 @@ { public class IfcSubContractResource extends IfcConstructionResource { - private IfcSubContractResourceTypeEnum PredefinedType; + private IfcActorSelect SubContractor; + private string JobDescription; } } diff --git a/IfcConstructionMgmtDomain/IfcSubContractResourceType.java b/IfcConstructionMgmtDomain/IfcSubContractResourceType.java deleted file mode 100644 index 161ab9c2..00000000 --- a/IfcConstructionMgmtDomain/IfcSubContractResourceType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSubContractResourceType extends IfcConstructionResourceType - { - private IfcSubContractResourceTypeEnum PredefinedType; - } -} diff --git a/IfcControlExtension/IfcPerformanceHistory.java b/IfcControlExtension/IfcPerformanceHistory.java index 32f3ba91..356de5de 100644 --- a/IfcControlExtension/IfcPerformanceHistory.java +++ b/IfcControlExtension/IfcPerformanceHistory.java @@ -6,6 +6,5 @@ public class IfcPerformanceHistory extends IfcControl { private string LifeCyclePhase; - private IfcPerformanceHistoryTypeEnum PredefinedType; } } diff --git a/IfcControlExtension/IfcTimeSeriesSchedule.java b/IfcControlExtension/IfcTimeSeriesSchedule.java new file mode 100644 index 00000000..0db30d82 --- /dev/null +++ b/IfcControlExtension/IfcTimeSeriesSchedule.java @@ -0,0 +1,12 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcTimeSeriesSchedule extends IfcControl + { + private IfcDateTimeSelect[] ApplicableDates; + private IfcTimeSeriesScheduleTypeEnum TimeSeriesScheduleType; + private IfcTimeSeries TimeSeries; + } +} diff --git a/IfcConstructionMgmtDomain/IfcConstructionProductResourceTypeEnum.java b/IfcControlExtension/IfcTimeSeriesScheduleTypeEnum.java similarity index 73% rename from IfcConstructionMgmtDomain/IfcConstructionProductResourceTypeEnum.java rename to IfcControlExtension/IfcTimeSeriesScheduleTypeEnum.java index fdce08a7..8c83ccc3 100644 --- a/IfcConstructionMgmtDomain/IfcConstructionProductResourceTypeEnum.java +++ b/IfcControlExtension/IfcTimeSeriesScheduleTypeEnum.java @@ -3,10 +3,12 @@ package buildingsmart.ifc { - public enum IfcConstructionProductResourceTypeEnum + public enum IfcTimeSeriesScheduleTypeEnum { - ASSEMBLY, - FORMWORK, + ANNUAL, + MONTHLY, + WEEKLY, + DAILY, USERDEFINED, NOTDEFINED, } diff --git a/IfcCostResource/IfcAppliedValue.java b/IfcCostResource/IfcAppliedValue.java index c2e45304..1c6f71d0 100644 --- a/IfcCostResource/IfcAppliedValue.java +++ b/IfcCostResource/IfcAppliedValue.java @@ -9,12 +9,10 @@ public class IfcAppliedValue extends IfcBase private string Description; private IfcAppliedValueSelect AppliedValue; private IfcMeasureWithUnit UnitBasis; - private string ApplicableDate; - private string FixedUntilDate; - private string Category; - private string Condition; - private IfcArithmeticOperatorEnum ArithmeticOperator; - private IfcAppliedValue[] Components; - private IfcExternalReferenceRelationship[] HasExternalReference; + private IfcDateTimeSelect ApplicableDate; + private IfcDateTimeSelect FixedUntilDate; + private IfcReferencesValueDocument[] ValuesReferenced; + private IfcAppliedValueRelationship[] ValueOfComponents; + private IfcAppliedValueRelationship[] IsComponentIn; } } diff --git a/IfcCostResource/IfcAppliedValueRelationship.java b/IfcCostResource/IfcAppliedValueRelationship.java new file mode 100644 index 00000000..e1f1eeb2 --- /dev/null +++ b/IfcCostResource/IfcAppliedValueRelationship.java @@ -0,0 +1,14 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcAppliedValueRelationship extends IfcBase + { + private IfcAppliedValue ComponentOfTotal; + private IfcAppliedValue[] Components; + private IfcArithmeticOperatorEnum ArithmeticOperator; + private string Name; + private string Description; + } +} diff --git a/IfcCostResource/IfcCostValue.java b/IfcCostResource/IfcCostValue.java index aaade37c..f41aa9df 100644 --- a/IfcCostResource/IfcCostValue.java +++ b/IfcCostResource/IfcCostValue.java @@ -5,5 +5,7 @@ { public class IfcCostValue extends IfcAppliedValue { + private string CostType; + private string Condition; } } diff --git a/IfcCostResource/IfcCurrencyRelationship.java b/IfcCostResource/IfcCurrencyRelationship.java index f6d1a6f1..3095cea6 100644 --- a/IfcCostResource/IfcCurrencyRelationship.java +++ b/IfcCostResource/IfcCurrencyRelationship.java @@ -3,12 +3,12 @@ package buildingsmart.ifc { - public class IfcCurrencyRelationship extends IfcResourceLevelRelationship + public class IfcCurrencyRelationship extends IfcBase { private IfcMonetaryUnit RelatingMonetaryUnit; private IfcMonetaryUnit RelatedMonetaryUnit; private IfcRatioMeasure ExchangeRate; - private string RateDateTime; + private IfcDateAndTime RateDateTime; private IfcLibraryInformation RateSource; } } diff --git a/IfcCostResource/IfcEnvironmentalImpactCategoryEnum.java b/IfcCostResource/IfcEnvironmentalImpactCategoryEnum.java new file mode 100644 index 00000000..6cf57c2b --- /dev/null +++ b/IfcCostResource/IfcEnvironmentalImpactCategoryEnum.java @@ -0,0 +1,17 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public enum IfcEnvironmentalImpactCategoryEnum + { + COMBINEDVALUE, + DISPOSAL, + EXTRACTION, + INSTALLATION, + MANUFACTURE, + TRANSPORTATION, + USERDEFINED, + NOTDEFINED, + } +} diff --git a/IfcConstructionMgmtDomain/IfcConstructionResourceType.java b/IfcCostResource/IfcEnvironmentalImpactValue.java similarity index 51% rename from IfcConstructionMgmtDomain/IfcConstructionResourceType.java rename to IfcCostResource/IfcEnvironmentalImpactValue.java index f31c5fab..6c5bf6f6 100644 --- a/IfcConstructionMgmtDomain/IfcConstructionResourceType.java +++ b/IfcCostResource/IfcEnvironmentalImpactValue.java @@ -3,9 +3,10 @@ package buildingsmart.ifc { - public class IfcConstructionResourceType extends IfcTypeResource + public class IfcEnvironmentalImpactValue extends IfcAppliedValue { - private IfcAppliedValue[] BaseCosts; - private IfcPhysicalQuantity BaseQuantity; + private string ImpactType; + private IfcEnvironmentalImpactCategoryEnum Category; + private string UserDefinedCategory; } } diff --git a/IfcMaterialResource/IfcMaterialConstituentSet.java b/IfcCostResource/IfcReferencesValueDocument.java similarity index 62% rename from IfcMaterialResource/IfcMaterialConstituentSet.java rename to IfcCostResource/IfcReferencesValueDocument.java index c64e8aed..06403ef5 100644 --- a/IfcMaterialResource/IfcMaterialConstituentSet.java +++ b/IfcCostResource/IfcReferencesValueDocument.java @@ -3,10 +3,11 @@ package buildingsmart.ifc { - public class IfcMaterialConstituentSet extends IfcMaterialDefinition + public class IfcReferencesValueDocument extends IfcBase { + private IfcDocumentSelect ReferencedDocument; + private IfcAppliedValue[] ReferencingValues; private string Name; private string Description; - private IfcMaterialConstituent[] MaterialConstituents; } } diff --git a/IfcDateTimeResource/IfcAheadOrBehind.java b/IfcDateTimeResource/IfcAheadOrBehind.java new file mode 100644 index 00000000..a6b0e842 --- /dev/null +++ b/IfcDateTimeResource/IfcAheadOrBehind.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public enum IfcAheadOrBehind + { + AHEAD, + BEHIND, + } +} diff --git a/IfcDateTimeResource/IfcCalendarDate.java b/IfcDateTimeResource/IfcCalendarDate.java new file mode 100644 index 00000000..a1b04ba1 --- /dev/null +++ b/IfcDateTimeResource/IfcCalendarDate.java @@ -0,0 +1,12 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcCalendarDate extends IfcBase + { + private int DayComponent; + private int MonthComponent; + private int YearComponent; + } +} diff --git a/IfcDateTimeResource/IfcCoordinatedUniversalTimeOffset.java b/IfcDateTimeResource/IfcCoordinatedUniversalTimeOffset.java new file mode 100644 index 00000000..ac7a510c --- /dev/null +++ b/IfcDateTimeResource/IfcCoordinatedUniversalTimeOffset.java @@ -0,0 +1,12 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcCoordinatedUniversalTimeOffset extends IfcBase + { + private int HourOffset; + private int MinuteOffset; + private IfcAheadOrBehind Sense; + } +} diff --git a/IfcBuildingControlsDomain/IfcFlowInstrument.java b/IfcDateTimeResource/IfcDateAndTime.java similarity index 61% rename from IfcBuildingControlsDomain/IfcFlowInstrument.java rename to IfcDateTimeResource/IfcDateAndTime.java index f1b03dcf..596722be 100644 --- a/IfcBuildingControlsDomain/IfcFlowInstrument.java +++ b/IfcDateTimeResource/IfcDateAndTime.java @@ -3,8 +3,9 @@ package buildingsmart.ifc { - public class IfcFlowInstrument extends IfcDistributionControlElement + public class IfcDateAndTime extends IfcBase { - private IfcFlowInstrumentTypeEnum PredefinedType; + private IfcCalendarDate DateComponent; + private IfcLocalTime TimeComponent; } } diff --git a/IfcKernel/IfcProcessSelect.java b/IfcDateTimeResource/IfcDateTimeSelect.java similarity index 84% rename from IfcKernel/IfcProcessSelect.java rename to IfcDateTimeResource/IfcDateTimeSelect.java index 0490e749..e3580261 100644 --- a/IfcKernel/IfcProcessSelect.java +++ b/IfcDateTimeResource/IfcDateTimeSelect.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public interface IfcProcessSelect + public interface IfcDateTimeSelect { } } diff --git a/IfcDateTimeResource/IfcDate.java b/IfcDateTimeResource/IfcDaylightSavingHour.java similarity index 100% rename from IfcDateTimeResource/IfcDate.java rename to IfcDateTimeResource/IfcDaylightSavingHour.java diff --git a/IfcDateTimeResource/IfcEventTime.java b/IfcDateTimeResource/IfcEventTime.java deleted file mode 100644 index d53f79e5..00000000 --- a/IfcDateTimeResource/IfcEventTime.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcEventTime extends IfcSchedulingTime - { - private string ActualDate; - private string EarlyDate; - private string LateDate; - private string ScheduleDate; - } -} diff --git a/IfcDateTimeResource/IfcDateTime.java b/IfcDateTimeResource/IfcHourInDay.java similarity index 100% rename from IfcDateTimeResource/IfcDateTime.java rename to IfcDateTimeResource/IfcHourInDay.java diff --git a/IfcDateTimeResource/IfcLagTime.java b/IfcDateTimeResource/IfcLagTime.java deleted file mode 100644 index f119e372..00000000 --- a/IfcDateTimeResource/IfcLagTime.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcLagTime extends IfcSchedulingTime - { - private IfcTimeOrRatioSelect LagValue; - private IfcTaskDurationEnum DurationType; - } -} diff --git a/IfcDateTimeResource/IfcLocalTime.java b/IfcDateTimeResource/IfcLocalTime.java new file mode 100644 index 00000000..06411fc2 --- /dev/null +++ b/IfcDateTimeResource/IfcLocalTime.java @@ -0,0 +1,14 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcLocalTime extends IfcBase + { + private int HourComponent; + private int MinuteComponent; + private double SecondComponent; + private IfcCoordinatedUniversalTimeOffset Zone; + private int DaylightSavingOffset; + } +} diff --git a/IfcDateTimeResource/IfcDayInWeekNumber.java b/IfcDateTimeResource/IfcMinuteInHour.java similarity index 100% rename from IfcDateTimeResource/IfcDayInWeekNumber.java rename to IfcDateTimeResource/IfcMinuteInHour.java diff --git a/IfcDateTimeResource/IfcRecurrencePattern.java b/IfcDateTimeResource/IfcRecurrencePattern.java deleted file mode 100644 index c2535d91..00000000 --- a/IfcDateTimeResource/IfcRecurrencePattern.java +++ /dev/null @@ -1,17 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcRecurrencePattern extends IfcBase - { - private IfcRecurrenceTypeEnum RecurrenceType; - private int[] DayComponent; - private int[] WeekdayComponent; - private int[] MonthComponent; - private int Position; - private int Interval; - private int Occurrences; - private IfcTimePeriod[] TimePeriods; - } -} diff --git a/IfcDateTimeResource/IfcRecurrenceTypeEnum.java b/IfcDateTimeResource/IfcRecurrenceTypeEnum.java deleted file mode 100644 index 641f5d5b..00000000 --- a/IfcDateTimeResource/IfcRecurrenceTypeEnum.java +++ /dev/null @@ -1,17 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcRecurrenceTypeEnum - { - DAILY, - WEEKLY, - MONTHLY_BY_DAY_OF_MONTH, - MONTHLY_BY_POSITION, - BY_DAY_COUNT, - BY_WEEKDAY_COUNT, - YEARLY_BY_DAY_OF_MONTH, - YEARLY_BY_POSITION, - } -} diff --git a/IfcDateTimeResource/IfcResourceTime.java b/IfcDateTimeResource/IfcResourceTime.java deleted file mode 100644 index 9de17b50..00000000 --- a/IfcDateTimeResource/IfcResourceTime.java +++ /dev/null @@ -1,24 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcResourceTime extends IfcSchedulingTime - { - private string ScheduleWork; - private IfcRatioMeasure ScheduleUsage; - private string ScheduleStart; - private string ScheduleFinish; - private string ScheduleContour; - private string LevelingDelay; - private bool IsOverAllocated; - private string StatusTime; - private string ActualWork; - private IfcRatioMeasure ActualUsage; - private string ActualStart; - private string ActualFinish; - private string RemainingWork; - private IfcRatioMeasure RemainingUsage; - private IfcRatioMeasure Completion; - } -} diff --git a/IfcDateTimeResource/IfcSchedulingTime.java b/IfcDateTimeResource/IfcSchedulingTime.java deleted file mode 100644 index de842171..00000000 --- a/IfcDateTimeResource/IfcSchedulingTime.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSchedulingTime extends IfcBase - { - private string Name; - private IfcDataOriginEnum DataOrigin; - private string UserDefinedDataOrigin; - } -} diff --git a/IfcDateTimeResource/IfcDuration.java b/IfcDateTimeResource/IfcSecondInMinute.java similarity index 100% rename from IfcDateTimeResource/IfcDuration.java rename to IfcDateTimeResource/IfcSecondInMinute.java diff --git a/IfcDateTimeResource/IfcTaskTime.java b/IfcDateTimeResource/IfcTaskTime.java deleted file mode 100644 index 09f066c6..00000000 --- a/IfcDateTimeResource/IfcTaskTime.java +++ /dev/null @@ -1,26 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcTaskTime extends IfcSchedulingTime - { - private IfcTaskDurationEnum DurationType; - private string ScheduleDuration; - private string ScheduleStart; - private string ScheduleFinish; - private string EarlyStart; - private string EarlyFinish; - private string LateStart; - private string LateFinish; - private string FreeFloat; - private string TotalFloat; - private bool IsCritical; - private string StatusTime; - private string ActualDuration; - private string ActualStart; - private string ActualFinish; - private string RemainingTime; - private IfcRatioMeasure Completion; - } -} diff --git a/IfcDateTimeResource/IfcTaskTimeRecurring.java b/IfcDateTimeResource/IfcTaskTimeRecurring.java deleted file mode 100644 index 056959d7..00000000 --- a/IfcDateTimeResource/IfcTaskTimeRecurring.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcTaskTimeRecurring extends IfcTaskTime - { - private IfcRecurrencePattern Recurrence; - } -} diff --git a/IfcDateTimeResource/IfcTimePeriod.java b/IfcDateTimeResource/IfcTimePeriod.java deleted file mode 100644 index 8ba0dd27..00000000 --- a/IfcDateTimeResource/IfcTimePeriod.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcTimePeriod extends IfcBase - { - private string StartTime; - private string EndTime; - } -} diff --git a/IfcDateTimeResource/IfcWorkTime.java b/IfcDateTimeResource/IfcWorkTime.java deleted file mode 100644 index 911264b3..00000000 --- a/IfcDateTimeResource/IfcWorkTime.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcWorkTime extends IfcSchedulingTime - { - private IfcRecurrencePattern RecurrencePattern; - private string Start; - private string Finish; - } -} diff --git a/IfcDateTimeResource/IfcTime.java b/IfcDateTimeResource/IfcYearNumber.java similarity index 100% rename from IfcDateTimeResource/IfcTime.java rename to IfcDateTimeResource/IfcYearNumber.java diff --git a/IfcElectricalDomain/IfcAudioVisualAppliance.java b/IfcElectricalDomain/IfcAudioVisualAppliance.java deleted file mode 100644 index 5db70b3b..00000000 --- a/IfcElectricalDomain/IfcAudioVisualAppliance.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcAudioVisualAppliance extends IfcFlowTerminal - { - private IfcAudioVisualApplianceTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcAudioVisualApplianceType.java b/IfcElectricalDomain/IfcAudioVisualApplianceType.java deleted file mode 100644 index 606c74c9..00000000 --- a/IfcElectricalDomain/IfcAudioVisualApplianceType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcAudioVisualApplianceType extends IfcFlowTerminalType - { - private IfcAudioVisualApplianceTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcAudioVisualApplianceTypeEnum.java b/IfcElectricalDomain/IfcAudioVisualApplianceTypeEnum.java deleted file mode 100644 index 23ff9223..00000000 --- a/IfcElectricalDomain/IfcAudioVisualApplianceTypeEnum.java +++ /dev/null @@ -1,22 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcAudioVisualApplianceTypeEnum - { - AMPLIFIER, - CAMERA, - DISPLAY, - MICROPHONE, - PLAYER, - PROJECTOR, - RECEIVER, - SPEAKER, - SWITCHER, - TELEPHONE, - TUNER, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcElectricalDomain/IfcCableCarrierFitting.java b/IfcElectricalDomain/IfcCableCarrierFitting.java deleted file mode 100644 index e21a9a12..00000000 --- a/IfcElectricalDomain/IfcCableCarrierFitting.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCableCarrierFitting extends IfcFlowFitting - { - private IfcCableCarrierFittingTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcCableCarrierSegment.java b/IfcElectricalDomain/IfcCableCarrierSegment.java deleted file mode 100644 index 227ee8cc..00000000 --- a/IfcElectricalDomain/IfcCableCarrierSegment.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCableCarrierSegment extends IfcFlowSegment - { - private IfcCableCarrierSegmentTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcCableFitting.java b/IfcElectricalDomain/IfcCableFitting.java deleted file mode 100644 index 29a0c815..00000000 --- a/IfcElectricalDomain/IfcCableFitting.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCableFitting extends IfcFlowFitting - { - private IfcCableFittingTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcCableFittingType.java b/IfcElectricalDomain/IfcCableFittingType.java deleted file mode 100644 index 52caa675..00000000 --- a/IfcElectricalDomain/IfcCableFittingType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCableFittingType extends IfcFlowFittingType - { - private IfcCableFittingTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcCableFittingTypeEnum.java b/IfcElectricalDomain/IfcCableFittingTypeEnum.java deleted file mode 100644 index 09ac0b9d..00000000 --- a/IfcElectricalDomain/IfcCableFittingTypeEnum.java +++ /dev/null @@ -1,16 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcCableFittingTypeEnum - { - CONNECTOR, - ENTRY, - EXIT, - JUNCTION, - TRANSITION, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcElectricalDomain/IfcCableSegment.java b/IfcElectricalDomain/IfcCableSegment.java deleted file mode 100644 index 723baaaa..00000000 --- a/IfcElectricalDomain/IfcCableSegment.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCableSegment extends IfcFlowSegment - { - private IfcCableSegmentTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcCableSegmentTypeEnum.java b/IfcElectricalDomain/IfcCableSegmentTypeEnum.java index 84688728..1cb90b32 100644 --- a/IfcElectricalDomain/IfcCableSegmentTypeEnum.java +++ b/IfcElectricalDomain/IfcCableSegmentTypeEnum.java @@ -5,10 +5,8 @@ { public enum IfcCableSegmentTypeEnum { - BUSBARSEGMENT, CABLESEGMENT, CONDUCTORSEGMENT, - CORESEGMENT, USERDEFINED, NOTDEFINED, } diff --git a/IfcElectricalDomain/IfcCommunicationsAppliance.java b/IfcElectricalDomain/IfcCommunicationsAppliance.java deleted file mode 100644 index fc1c54a3..00000000 --- a/IfcElectricalDomain/IfcCommunicationsAppliance.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCommunicationsAppliance extends IfcFlowTerminal - { - private IfcCommunicationsApplianceTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcCommunicationsApplianceType.java b/IfcElectricalDomain/IfcCommunicationsApplianceType.java deleted file mode 100644 index 5cd50a8c..00000000 --- a/IfcElectricalDomain/IfcCommunicationsApplianceType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCommunicationsApplianceType extends IfcFlowTerminalType - { - private IfcCommunicationsApplianceTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcCommunicationsApplianceTypeEnum.java b/IfcElectricalDomain/IfcCommunicationsApplianceTypeEnum.java deleted file mode 100644 index e83867d6..00000000 --- a/IfcElectricalDomain/IfcCommunicationsApplianceTypeEnum.java +++ /dev/null @@ -1,23 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcCommunicationsApplianceTypeEnum - { - ANTENNA, - COMPUTER, - FAX, - GATEWAY, - MODEM, - NETWORKAPPLIANCE, - NETWORKBRIDGE, - NETWORKHUB, - PRINTER, - REPEATER, - ROUTER, - SCANNER, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcElectricalDomain/IfcElectricAppliance.java b/IfcElectricalDomain/IfcElectricAppliance.java deleted file mode 100644 index 77637c0b..00000000 --- a/IfcElectricalDomain/IfcElectricAppliance.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcElectricAppliance extends IfcFlowTerminal - { - private IfcElectricApplianceTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcElectricApplianceTypeEnum.java b/IfcElectricalDomain/IfcElectricApplianceTypeEnum.java index 59f0a14a..fae89316 100644 --- a/IfcElectricalDomain/IfcElectricApplianceTypeEnum.java +++ b/IfcElectricalDomain/IfcElectricApplianceTypeEnum.java @@ -5,22 +5,30 @@ { public enum IfcElectricApplianceTypeEnum { + COMPUTER, + DIRECTWATERHEATER, DISHWASHER, ELECTRICCOOKER, - FREESTANDINGELECTRICHEATER, + ELECTRICHEATER, + FACSIMILE, FREESTANDINGFAN, - FREESTANDINGWATERHEATER, - FREESTANDINGWATERCOOLER, FREEZER, FRIDGE_FREEZER, HANDDRYER, - KITCHENMACHINE, + INDIRECTWATERHEATER, MICROWAVE, PHOTOCOPIER, + PRINTER, REFRIGERATOR, + RADIANTHEATER, + SCANNER, + TELEPHONE, TUMBLEDRYER, + TV, VENDINGMACHINE, WASHINGMACHINE, + WATERHEATER, + WATERCOOLER, USERDEFINED, NOTDEFINED, } diff --git a/IfcElectricalDomain/IfcElectricDistributionBoardType.java b/IfcElectricalDomain/IfcElectricDistributionBoardType.java deleted file mode 100644 index 10824b1d..00000000 --- a/IfcElectricalDomain/IfcElectricDistributionBoardType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcElectricDistributionBoardType extends IfcFlowControllerType - { - private IfcElectricDistributionBoardTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcElectricDistributionBoard.java b/IfcElectricalDomain/IfcElectricDistributionPoint.java similarity index 52% rename from IfcElectricalDomain/IfcElectricDistributionBoard.java rename to IfcElectricalDomain/IfcElectricDistributionPoint.java index c371cb90..37e30567 100644 --- a/IfcElectricalDomain/IfcElectricDistributionBoard.java +++ b/IfcElectricalDomain/IfcElectricDistributionPoint.java @@ -3,8 +3,9 @@ package buildingsmart.ifc { - public class IfcElectricDistributionBoard extends IfcFlowController + public class IfcElectricDistributionPoint extends IfcFlowController { - private IfcElectricDistributionBoardTypeEnum PredefinedType; + private IfcElectricDistributionPointFunctionEnum DistributionPointFunction; + private string UserDefinedFunction; } } diff --git a/IfcElectricalDomain/IfcElectricDistributionBoardTypeEnum.java b/IfcElectricalDomain/IfcElectricDistributionPointFunctionEnum.java similarity index 68% rename from IfcElectricalDomain/IfcElectricDistributionBoardTypeEnum.java rename to IfcElectricalDomain/IfcElectricDistributionPointFunctionEnum.java index ad1256fb..f3230dec 100644 --- a/IfcElectricalDomain/IfcElectricDistributionBoardTypeEnum.java +++ b/IfcElectricalDomain/IfcElectricDistributionPointFunctionEnum.java @@ -3,10 +3,15 @@ package buildingsmart.ifc { - public enum IfcElectricDistributionBoardTypeEnum + public enum IfcElectricDistributionPointFunctionEnum { + ALARMPANEL, CONSUMERUNIT, + CONTROLPANEL, DISTRIBUTIONBOARD, + GASDETECTORPANEL, + INDICATORPANEL, + MIMICPANEL, MOTORCONTROLCENTRE, SWITCHBOARD, USERDEFINED, diff --git a/IfcElectricalDomain/IfcElectricFlowStorageDevice.java b/IfcElectricalDomain/IfcElectricFlowStorageDevice.java deleted file mode 100644 index 7ecefbd1..00000000 --- a/IfcElectricalDomain/IfcElectricFlowStorageDevice.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcElectricFlowStorageDevice extends IfcFlowStorageDevice - { - private IfcElectricFlowStorageDeviceTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcElectricGenerator.java b/IfcElectricalDomain/IfcElectricGenerator.java deleted file mode 100644 index d60a7567..00000000 --- a/IfcElectricalDomain/IfcElectricGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcElectricGenerator extends IfcEnergyConversionDevice - { - private IfcElectricGeneratorTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcElectricGeneratorTypeEnum.java b/IfcElectricalDomain/IfcElectricGeneratorTypeEnum.java index 3541749c..c94dc182 100644 --- a/IfcElectricalDomain/IfcElectricGeneratorTypeEnum.java +++ b/IfcElectricalDomain/IfcElectricGeneratorTypeEnum.java @@ -5,9 +5,6 @@ { public enum IfcElectricGeneratorTypeEnum { - CHP, - ENGINEGENERATOR, - STANDALONE, USERDEFINED, NOTDEFINED, } diff --git a/IfcElectricalDomain/IfcElectricHeaterType.java b/IfcElectricalDomain/IfcElectricHeaterType.java new file mode 100644 index 00000000..597c6efd --- /dev/null +++ b/IfcElectricalDomain/IfcElectricHeaterType.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcElectricHeaterType extends IfcFlowTerminalType + { + private IfcElectricHeaterTypeEnum PredefinedType; + } +} diff --git a/IfcElectricalDomain/IfcElectricHeaterTypeEnum.java b/IfcElectricalDomain/IfcElectricHeaterTypeEnum.java new file mode 100644 index 00000000..d16274fe --- /dev/null +++ b/IfcElectricalDomain/IfcElectricHeaterTypeEnum.java @@ -0,0 +1,14 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public enum IfcElectricHeaterTypeEnum + { + ELECTRICPOINTHEATER, + ELECTRICCABLEHEATER, + ELECTRICMATHEATER, + USERDEFINED, + NOTDEFINED, + } +} diff --git a/IfcElectricalDomain/IfcElectricMotor.java b/IfcElectricalDomain/IfcElectricMotor.java deleted file mode 100644 index 5dc52990..00000000 --- a/IfcElectricalDomain/IfcElectricMotor.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcElectricMotor extends IfcEnergyConversionDevice - { - private IfcElectricMotorTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcElectricTimeControl.java b/IfcElectricalDomain/IfcElectricTimeControl.java deleted file mode 100644 index d339432a..00000000 --- a/IfcElectricalDomain/IfcElectricTimeControl.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcElectricTimeControl extends IfcFlowController - { - private IfcElectricTimeControlTypeEnum PredefinedType; - } -} diff --git a/IfcExternalReferenceResource/IfcClassificationReferenceSelect.java b/IfcElectricalDomain/IfcElectricalCircuit.java similarity index 78% rename from IfcExternalReferenceResource/IfcClassificationReferenceSelect.java rename to IfcElectricalDomain/IfcElectricalCircuit.java index 4eb4bce8..a1cb6041 100644 --- a/IfcExternalReferenceResource/IfcClassificationReferenceSelect.java +++ b/IfcElectricalDomain/IfcElectricalCircuit.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public interface IfcClassificationReferenceSelect + public class IfcElectricalCircuit extends IfcSystem { } } diff --git a/IfcElectricalDomain/IfcJunctionBox.java b/IfcElectricalDomain/IfcJunctionBox.java deleted file mode 100644 index f8c78933..00000000 --- a/IfcElectricalDomain/IfcJunctionBox.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcJunctionBox extends IfcFlowFitting - { - private IfcJunctionBoxTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcJunctionBoxTypeEnum.java b/IfcElectricalDomain/IfcJunctionBoxTypeEnum.java index 95a2dc07..1f4b0f3c 100644 --- a/IfcElectricalDomain/IfcJunctionBoxTypeEnum.java +++ b/IfcElectricalDomain/IfcJunctionBoxTypeEnum.java @@ -5,8 +5,6 @@ { public enum IfcJunctionBoxTypeEnum { - DATA, - POWER, USERDEFINED, NOTDEFINED, } diff --git a/IfcElectricalDomain/IfcLamp.java b/IfcElectricalDomain/IfcLamp.java deleted file mode 100644 index 9db2892e..00000000 --- a/IfcElectricalDomain/IfcLamp.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcLamp extends IfcFlowTerminal - { - private IfcLampTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcLampTypeEnum.java b/IfcElectricalDomain/IfcLampTypeEnum.java index 1c9767b9..20d303d8 100644 --- a/IfcElectricalDomain/IfcLampTypeEnum.java +++ b/IfcElectricalDomain/IfcLampTypeEnum.java @@ -7,12 +7,9 @@ public enum IfcLampTypeEnum { COMPACTFLUORESCENT, FLUORESCENT, - HALOGEN, HIGHPRESSUREMERCURY, HIGHPRESSURESODIUM, - LED, METALHALIDE, - OLED, TUNGSTENFILAMENT, USERDEFINED, NOTDEFINED, diff --git a/IfcElectricalDomain/IfcLightFixture.java b/IfcElectricalDomain/IfcLightFixture.java deleted file mode 100644 index b401a753..00000000 --- a/IfcElectricalDomain/IfcLightFixture.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcLightFixture extends IfcFlowTerminal - { - private IfcLightFixtureTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcLightFixtureTypeEnum.java b/IfcElectricalDomain/IfcLightFixtureTypeEnum.java index 43aa37ea..269004e4 100644 --- a/IfcElectricalDomain/IfcLightFixtureTypeEnum.java +++ b/IfcElectricalDomain/IfcLightFixtureTypeEnum.java @@ -7,7 +7,6 @@ public enum IfcLightFixtureTypeEnum { POINTSOURCE, DIRECTIONSOURCE, - SECURITYLIGHTING, USERDEFINED, NOTDEFINED, } diff --git a/IfcElectricalDomain/IfcMotorConnection.java b/IfcElectricalDomain/IfcMotorConnection.java deleted file mode 100644 index 35477b52..00000000 --- a/IfcElectricalDomain/IfcMotorConnection.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMotorConnection extends IfcEnergyConversionDevice - { - private IfcMotorConnectionTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcOutlet.java b/IfcElectricalDomain/IfcOutlet.java deleted file mode 100644 index ce5e43a2..00000000 --- a/IfcElectricalDomain/IfcOutlet.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcOutlet extends IfcFlowTerminal - { - private IfcOutletTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcOutletTypeEnum.java b/IfcElectricalDomain/IfcOutletTypeEnum.java index 8979ab00..96c694e0 100644 --- a/IfcElectricalDomain/IfcOutletTypeEnum.java +++ b/IfcElectricalDomain/IfcOutletTypeEnum.java @@ -8,8 +8,6 @@ public enum IfcOutletTypeEnum AUDIOVISUALOUTLET, COMMUNICATIONSOUTLET, POWEROUTLET, - DATAOUTLET, - TELEPHONEOUTLET, USERDEFINED, NOTDEFINED, } diff --git a/IfcElectricalDomain/IfcProtectiveDevice.java b/IfcElectricalDomain/IfcProtectiveDevice.java deleted file mode 100644 index 009974e5..00000000 --- a/IfcElectricalDomain/IfcProtectiveDevice.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcProtectiveDevice extends IfcFlowController - { - private IfcProtectiveDeviceTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcProtectiveDeviceTrippingUnit.java b/IfcElectricalDomain/IfcProtectiveDeviceTrippingUnit.java deleted file mode 100644 index 921d063c..00000000 --- a/IfcElectricalDomain/IfcProtectiveDeviceTrippingUnit.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcProtectiveDeviceTrippingUnit extends IfcDistributionControlElement - { - private IfcProtectiveDeviceTrippingUnitTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcProtectiveDeviceTrippingUnitType.java b/IfcElectricalDomain/IfcProtectiveDeviceTrippingUnitType.java deleted file mode 100644 index f5f291f0..00000000 --- a/IfcElectricalDomain/IfcProtectiveDeviceTrippingUnitType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcProtectiveDeviceTrippingUnitType extends IfcDistributionControlElementType - { - private IfcProtectiveDeviceTrippingUnitTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcProtectiveDeviceTrippingUnitTypeEnum.java b/IfcElectricalDomain/IfcProtectiveDeviceTrippingUnitTypeEnum.java deleted file mode 100644 index 459d7167..00000000 --- a/IfcElectricalDomain/IfcProtectiveDeviceTrippingUnitTypeEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcProtectiveDeviceTrippingUnitTypeEnum - { - ELECTRONIC, - ELECTROMAGNETIC, - RESIDUALCURRENT, - THERMAL, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcElectricalDomain/IfcProtectiveDeviceTypeEnum.java b/IfcElectricalDomain/IfcProtectiveDeviceTypeEnum.java index 734695c8..16b1d841 100644 --- a/IfcElectricalDomain/IfcProtectiveDeviceTypeEnum.java +++ b/IfcElectricalDomain/IfcProtectiveDeviceTypeEnum.java @@ -5,10 +5,9 @@ { public enum IfcProtectiveDeviceTypeEnum { - CIRCUITBREAKER, - EARTHLEAKAGECIRCUITBREAKER, - EARTHINGSWITCH, FUSEDISCONNECTOR, + CIRCUITBREAKER, + EARTHFAILUREDEVICE, RESIDUALCURRENTCIRCUITBREAKER, RESIDUALCURRENTSWITCH, VARISTOR, diff --git a/IfcElectricalDomain/IfcSolarDevice.java b/IfcElectricalDomain/IfcSolarDevice.java deleted file mode 100644 index 800ae008..00000000 --- a/IfcElectricalDomain/IfcSolarDevice.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSolarDevice extends IfcEnergyConversionDevice - { - private IfcSolarDeviceTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcSolarDeviceType.java b/IfcElectricalDomain/IfcSolarDeviceType.java deleted file mode 100644 index 8e457db3..00000000 --- a/IfcElectricalDomain/IfcSolarDeviceType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSolarDeviceType extends IfcEnergyConversionDeviceType - { - private IfcSolarDeviceTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcSolarDeviceTypeEnum.java b/IfcElectricalDomain/IfcSolarDeviceTypeEnum.java deleted file mode 100644 index da09f181..00000000 --- a/IfcElectricalDomain/IfcSolarDeviceTypeEnum.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcSolarDeviceTypeEnum - { - SOLARCOLLECTOR, - SOLARPANEL, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcElectricalDomain/IfcSwitchingDevice.java b/IfcElectricalDomain/IfcSwitchingDevice.java deleted file mode 100644 index df391fa9..00000000 --- a/IfcElectricalDomain/IfcSwitchingDevice.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSwitchingDevice extends IfcFlowController - { - private IfcSwitchingDeviceTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcSwitchingDeviceTypeEnum.java b/IfcElectricalDomain/IfcSwitchingDeviceTypeEnum.java index c23f9612..bf0479fe 100644 --- a/IfcElectricalDomain/IfcSwitchingDeviceTypeEnum.java +++ b/IfcElectricalDomain/IfcSwitchingDeviceTypeEnum.java @@ -6,11 +6,7 @@ public enum IfcSwitchingDeviceTypeEnum { CONTACTOR, - DIMMERSWITCH, EMERGENCYSTOP, - KEYPAD, - MOMENTARYSWITCH, - SELECTORSWITCH, STARTER, SWITCHDISCONNECTOR, TOGGLESWITCH, diff --git a/IfcElectricalDomain/IfcTransformer.java b/IfcElectricalDomain/IfcTransformer.java deleted file mode 100644 index 025465e6..00000000 --- a/IfcElectricalDomain/IfcTransformer.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcTransformer extends IfcEnergyConversionDevice - { - private IfcTransformerTypeEnum PredefinedType; - } -} diff --git a/IfcElectricalDomain/IfcTransformerTypeEnum.java b/IfcElectricalDomain/IfcTransformerTypeEnum.java index 2a6dd87d..e8c5e0ac 100644 --- a/IfcElectricalDomain/IfcTransformerTypeEnum.java +++ b/IfcElectricalDomain/IfcTransformerTypeEnum.java @@ -7,8 +7,6 @@ public enum IfcTransformerTypeEnum { CURRENT, FREQUENCY, - INVERTER, - RECTIFIER, VOLTAGE, USERDEFINED, NOTDEFINED, diff --git a/IfcExternalReferenceResource/IfcClassification.java b/IfcExternalReferenceResource/IfcClassification.java index 05cb8962..700d8af2 100644 --- a/IfcExternalReferenceResource/IfcClassification.java +++ b/IfcExternalReferenceResource/IfcClassification.java @@ -3,16 +3,12 @@ package buildingsmart.ifc { - public class IfcClassification extends IfcExternalInformation + public class IfcClassification extends IfcBase { private string Source; private string Edition; - private string EditionDate; + private IfcCalendarDate EditionDate; private string Name; - private string Description; - private string Location; - private string[] ReferenceTokens; - private IfcRelAssociatesClassification[] ClassificationForObjects; - private IfcClassificationReference[] HasReferences; + private IfcClassificationItem[] Contains; } } diff --git a/IfcExternalReferenceResource/IfcClassificationItem.java b/IfcExternalReferenceResource/IfcClassificationItem.java new file mode 100644 index 00000000..072bb821 --- /dev/null +++ b/IfcExternalReferenceResource/IfcClassificationItem.java @@ -0,0 +1,14 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcClassificationItem extends IfcBase + { + private IfcClassificationNotationFacet Notation; + private IfcClassification ItemOf; + private string Title; + private IfcClassificationItemRelationship[] IsClassifiedItemIn; + private IfcClassificationItemRelationship[] IsClassifyingItemIn; + } +} diff --git a/IfcExternalReferenceResource/IfcClassificationItemRelationship.java b/IfcExternalReferenceResource/IfcClassificationItemRelationship.java new file mode 100644 index 00000000..18fb7061 --- /dev/null +++ b/IfcExternalReferenceResource/IfcClassificationItemRelationship.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcClassificationItemRelationship extends IfcBase + { + private IfcClassificationItem RelatingItem; + private IfcClassificationItem[] RelatedItems; + } +} diff --git a/IfcExternalReferenceResource/IfcClassificationNotation.java b/IfcExternalReferenceResource/IfcClassificationNotation.java new file mode 100644 index 00000000..788d833d --- /dev/null +++ b/IfcExternalReferenceResource/IfcClassificationNotation.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcClassificationNotation extends IfcBase + { + private IfcClassificationNotationFacet[] NotationFacets; + } +} diff --git a/IfcExternalReferenceResource/IfcClassificationNotationFacet.java b/IfcExternalReferenceResource/IfcClassificationNotationFacet.java new file mode 100644 index 00000000..ea67b8fa --- /dev/null +++ b/IfcExternalReferenceResource/IfcClassificationNotationFacet.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcClassificationNotationFacet extends IfcBase + { + private string NotationValue; + } +} diff --git a/IfcGeometricConstraintResource/IfcGridPlacementDirectionSelect.java b/IfcExternalReferenceResource/IfcClassificationNotationSelect.java similarity index 79% rename from IfcGeometricConstraintResource/IfcGridPlacementDirectionSelect.java rename to IfcExternalReferenceResource/IfcClassificationNotationSelect.java index 411f5300..796cbc8c 100644 --- a/IfcGeometricConstraintResource/IfcGridPlacementDirectionSelect.java +++ b/IfcExternalReferenceResource/IfcClassificationNotationSelect.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public interface IfcGridPlacementDirectionSelect + public interface IfcClassificationNotationSelect { } } diff --git a/IfcExternalReferenceResource/IfcClassificationReference.java b/IfcExternalReferenceResource/IfcClassificationReference.java index 6ce6a553..4f3cbbbf 100644 --- a/IfcExternalReferenceResource/IfcClassificationReference.java +++ b/IfcExternalReferenceResource/IfcClassificationReference.java @@ -5,10 +5,6 @@ { public class IfcClassificationReference extends IfcExternalReference { - private IfcClassificationReferenceSelect ReferencedSource; - private string Description; - private string Sort; - private IfcRelAssociatesClassification[] ClassificationRefForObjects; - private IfcClassificationReference[] HasReferences; + private IfcClassification ReferencedSource; } } diff --git a/IfcExternalReferenceResource/IfcDocumentElectronicFormat.java b/IfcExternalReferenceResource/IfcDocumentElectronicFormat.java new file mode 100644 index 00000000..66e542e8 --- /dev/null +++ b/IfcExternalReferenceResource/IfcDocumentElectronicFormat.java @@ -0,0 +1,12 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcDocumentElectronicFormat extends IfcBase + { + private string FileExtension; + private string MimeContentType; + private string MimeSubtype; + } +} diff --git a/IfcExternalReferenceResource/IfcDocumentInformation.java b/IfcExternalReferenceResource/IfcDocumentInformation.java index a69bae0a..46ca0b47 100644 --- a/IfcExternalReferenceResource/IfcDocumentInformation.java +++ b/IfcExternalReferenceResource/IfcDocumentInformation.java @@ -3,27 +3,25 @@ package buildingsmart.ifc { - public class IfcDocumentInformation extends IfcExternalInformation + public class IfcDocumentInformation extends IfcBase { - private string Identification; + private string DocumentId; private string Name; private string Description; - private string Location; + private IfcDocumentReference[] DocumentReferences; private string Purpose; private string IntendedUse; private string Scope; private string Revision; private IfcActorSelect DocumentOwner; private IfcActorSelect[] Editors; - private string CreationTime; - private string LastRevisionTime; - private string ElectronicFormat; - private string ValidFrom; - private string ValidUntil; + private IfcDateAndTime CreationTime; + private IfcDateAndTime LastRevisionTime; + private IfcDocumentElectronicFormat ElectronicFormat; + private IfcCalendarDate ValidFrom; + private IfcCalendarDate ValidUntil; private IfcDocumentConfidentialityEnum Confidentiality; private IfcDocumentStatusEnum Status; - private IfcRelAssociatesDocument[] DocumentInfoForObjects; - private IfcDocumentReference[] HasDocumentReferences; private IfcDocumentInformationRelationship[] IsPointedTo; private IfcDocumentInformationRelationship[] IsPointer; } diff --git a/IfcExternalReferenceResource/IfcDocumentInformationRelationship.java b/IfcExternalReferenceResource/IfcDocumentInformationRelationship.java index 8fbca921..d09829e0 100644 --- a/IfcExternalReferenceResource/IfcDocumentInformationRelationship.java +++ b/IfcExternalReferenceResource/IfcDocumentInformationRelationship.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcDocumentInformationRelationship extends IfcResourceLevelRelationship + public class IfcDocumentInformationRelationship extends IfcBase { private IfcDocumentInformation RelatingDocument; private IfcDocumentInformation[] RelatedDocuments; diff --git a/IfcExternalReferenceResource/IfcDocumentReference.java b/IfcExternalReferenceResource/IfcDocumentReference.java index 24ee688d..ed052b14 100644 --- a/IfcExternalReferenceResource/IfcDocumentReference.java +++ b/IfcExternalReferenceResource/IfcDocumentReference.java @@ -5,8 +5,6 @@ { public class IfcDocumentReference extends IfcExternalReference { - private string Description; - private IfcDocumentInformation ReferencedDocument; - private IfcRelAssociatesDocument[] DocumentRefForObjects; + private IfcDocumentInformation[] ReferenceToDocument; } } diff --git a/IfcExternalReferenceResource/IfcExternalReference.java b/IfcExternalReferenceResource/IfcExternalReference.java index b19a00ae..16d7ccc9 100644 --- a/IfcExternalReferenceResource/IfcExternalReference.java +++ b/IfcExternalReferenceResource/IfcExternalReference.java @@ -6,8 +6,7 @@ public class IfcExternalReference extends IfcBase { private string Location; - private string Identification; + private string ItemReference; private string Name; - private IfcExternalReferenceRelationship[] ExternalReferenceForResources; } } diff --git a/IfcExternalReferenceResource/IfcExternalReferenceRelationship.java b/IfcExternalReferenceResource/IfcExternalReferenceRelationship.java deleted file mode 100644 index 8c478f42..00000000 --- a/IfcExternalReferenceResource/IfcExternalReferenceRelationship.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcExternalReferenceRelationship extends IfcResourceLevelRelationship - { - private IfcExternalReference RelatingReference; - private IfcResourceObjectSelect[] RelatedResourceObjects; - } -} diff --git a/IfcExternalReferenceResource/IfcLanguageId.java b/IfcExternalReferenceResource/IfcLanguageId.java deleted file mode 100644 index e8edbfb5..00000000 --- a/IfcExternalReferenceResource/IfcLanguageId.java +++ /dev/null @@ -1,6 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ -} diff --git a/IfcExternalReferenceResource/IfcLibraryInformation.java b/IfcExternalReferenceResource/IfcLibraryInformation.java index 3dc5153c..a49b8250 100644 --- a/IfcExternalReferenceResource/IfcLibraryInformation.java +++ b/IfcExternalReferenceResource/IfcLibraryInformation.java @@ -3,15 +3,12 @@ package buildingsmart.ifc { - public class IfcLibraryInformation extends IfcExternalInformation + public class IfcLibraryInformation extends IfcBase { private string Name; private string Version; - private IfcActorSelect Publisher; - private string VersionDate; - private string Location; - private string Description; - private IfcRelAssociatesLibrary[] LibraryInfoForObjects; - private IfcLibraryReference[] HasLibraryReferences; + private IfcOrganization Publisher; + private IfcCalendarDate VersionDate; + private IfcLibraryReference[] LibraryReference; } } diff --git a/IfcExternalReferenceResource/IfcLibraryReference.java b/IfcExternalReferenceResource/IfcLibraryReference.java index 5080ef5a..3e605801 100644 --- a/IfcExternalReferenceResource/IfcLibraryReference.java +++ b/IfcExternalReferenceResource/IfcLibraryReference.java @@ -5,9 +5,6 @@ { public class IfcLibraryReference extends IfcExternalReference { - private string Description; - private IfcIdentifier Language; - private IfcLibraryInformation ReferencedLibrary; - private IfcRelAssociatesLibrary[] LibraryRefForObjects; + private IfcLibraryInformation[] ReferenceIntoLibrary; } } diff --git a/IfcExternalReferenceResource/IfcURIReference.java b/IfcExternalReferenceResource/IfcURIReference.java deleted file mode 100644 index e8edbfb5..00000000 --- a/IfcExternalReferenceResource/IfcURIReference.java +++ /dev/null @@ -1,6 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ -} diff --git a/IfcGeometricConstraintResource/IfcConnectionPortGeometry.java b/IfcGeometricConstraintResource/IfcConnectionPortGeometry.java new file mode 100644 index 00000000..689e762c --- /dev/null +++ b/IfcGeometricConstraintResource/IfcConnectionPortGeometry.java @@ -0,0 +1,12 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcConnectionPortGeometry extends IfcConnectionGeometry + { + private IfcAxis2Placement LocationAtRelatingElement; + private IfcAxis2Placement LocationAtRelatedElement; + private IfcProfileDef ProfileOfPort; + } +} diff --git a/IfcGeometricConstraintResource/IfcConnectionVolumeGeometry.java b/IfcGeometricConstraintResource/IfcConnectionVolumeGeometry.java deleted file mode 100644 index 32ac4d58..00000000 --- a/IfcGeometricConstraintResource/IfcConnectionVolumeGeometry.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcConnectionVolumeGeometry extends IfcConnectionGeometry - { - private IfcSolidOrShell VolumeOnRelatingElement; - private IfcSolidOrShell VolumeOnRelatedElement; - } -} diff --git a/IfcGeometricConstraintResource/IfcGridPlacement.java b/IfcGeometricConstraintResource/IfcGridPlacement.java index 7cc1a68b..9aff65d5 100644 --- a/IfcGeometricConstraintResource/IfcGridPlacement.java +++ b/IfcGeometricConstraintResource/IfcGridPlacement.java @@ -6,6 +6,6 @@ public class IfcGridPlacement extends IfcObjectPlacement { private IfcVirtualGridIntersection PlacementLocation; - private IfcGridPlacementDirectionSelect PlacementRefDirection; + private IfcVirtualGridIntersection PlacementRefDirection; } } diff --git a/IfcGeometricModelResource/IfcAdvancedBrep.java b/IfcGeometricModelResource/IfcAdvancedBrep.java deleted file mode 100644 index dc784613..00000000 --- a/IfcGeometricModelResource/IfcAdvancedBrep.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcAdvancedBrep extends IfcManifoldSolidBrep - { - } -} diff --git a/IfcGeometricModelResource/IfcAdvancedBrepWithVoids.java b/IfcGeometricModelResource/IfcAdvancedBrepWithVoids.java deleted file mode 100644 index 357a35c2..00000000 --- a/IfcGeometricModelResource/IfcAdvancedBrepWithVoids.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcAdvancedBrepWithVoids extends IfcAdvancedBrep - { - private IfcClosedShell[] Voids; - } -} diff --git a/IfcGeometricModelResource/IfcCartesianPointList.java b/IfcGeometricModelResource/IfcCartesianPointList.java deleted file mode 100644 index fff89b28..00000000 --- a/IfcGeometricModelResource/IfcCartesianPointList.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCartesianPointList extends IfcGeometricRepresentationItem - { - private int Dim; - } -} diff --git a/IfcGeometricModelResource/IfcCartesianPointList2D.java b/IfcGeometricModelResource/IfcCartesianPointList2D.java deleted file mode 100644 index f89c4ef5..00000000 --- a/IfcGeometricModelResource/IfcCartesianPointList2D.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCartesianPointList2D extends IfcCartesianPointList - { - private double[] CoordList; - } -} diff --git a/IfcGeometricModelResource/IfcCartesianPointList3D.java b/IfcGeometricModelResource/IfcCartesianPointList3D.java deleted file mode 100644 index 8cd7b1ee..00000000 --- a/IfcGeometricModelResource/IfcCartesianPointList3D.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCartesianPointList3D extends IfcCartesianPointList - { - private double[] CoordList; - } -} diff --git a/IfcGeometricModelResource/IfcExtrudedAreaSolidTapered.java b/IfcGeometricModelResource/IfcExtrudedAreaSolidTapered.java deleted file mode 100644 index 777b7d31..00000000 --- a/IfcGeometricModelResource/IfcExtrudedAreaSolidTapered.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcExtrudedAreaSolidTapered extends IfcExtrudedAreaSolid - { - private IfcProfileDef EndSweptArea; - } -} diff --git a/IfcGeometricModelResource/IfcFacetedBrepWithVoids.java b/IfcGeometricModelResource/IfcFacetedBrepWithVoids.java index 43a64986..97de0e7b 100644 --- a/IfcGeometricModelResource/IfcFacetedBrepWithVoids.java +++ b/IfcGeometricModelResource/IfcFacetedBrepWithVoids.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcFacetedBrepWithVoids extends IfcFacetedBrep + public class IfcFacetedBrepWithVoids extends IfcManifoldSolidBrep { private IfcClosedShell[] Voids; } diff --git a/IfcGeometricModelResource/IfcFixedReferenceSweptAreaSolid.java b/IfcGeometricModelResource/IfcFixedReferenceSweptAreaSolid.java deleted file mode 100644 index 0db4db5e..00000000 --- a/IfcGeometricModelResource/IfcFixedReferenceSweptAreaSolid.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcFixedReferenceSweptAreaSolid extends IfcSweptAreaSolid - { - private IfcCurve Directrix; - private double StartParam; - private double EndParam; - private IfcDirection FixedReference; - } -} diff --git a/IfcGeometricModelResource/IfcHalfSpaceSolid.java b/IfcGeometricModelResource/IfcHalfSpaceSolid.java index b7655c4f..bd4de7d6 100644 --- a/IfcGeometricModelResource/IfcHalfSpaceSolid.java +++ b/IfcGeometricModelResource/IfcHalfSpaceSolid.java @@ -6,7 +6,7 @@ public class IfcHalfSpaceSolid extends IfcGeometricRepresentationItem { private IfcSurface BaseSurface; - private bool AgreementFlag; + private BOOLEAN AgreementFlag; private int Dim; } } diff --git a/IfcGeometricModelResource/IfcIndexedPolygonalFace.java b/IfcGeometricModelResource/IfcIndexedPolygonalFace.java deleted file mode 100644 index d2066a9f..00000000 --- a/IfcGeometricModelResource/IfcIndexedPolygonalFace.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcIndexedPolygonalFace extends IfcTessellatedItem - { - private IfcInteger[] CoordIndex; - private IfcPolygonalFaceSet[] ToFaceSet; - } -} diff --git a/IfcGeometricModelResource/IfcIndexedPolygonalFaceWithVoids.java b/IfcGeometricModelResource/IfcIndexedPolygonalFaceWithVoids.java deleted file mode 100644 index 035ab1c2..00000000 --- a/IfcGeometricModelResource/IfcIndexedPolygonalFaceWithVoids.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcIndexedPolygonalFaceWithVoids extends IfcIndexedPolygonalFace - { - private IfcInteger[] InnerCoordIndices; - } -} diff --git a/IfcGeometricModelResource/IfcPolygonalFaceSet.java b/IfcGeometricModelResource/IfcPolygonalFaceSet.java deleted file mode 100644 index 71115336..00000000 --- a/IfcGeometricModelResource/IfcPolygonalFaceSet.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcPolygonalFaceSet extends IfcTessellatedFaceSet - { - private bool Closed; - private IfcIndexedPolygonalFace[] Faces; - private IfcInteger[] PnIndex; - } -} diff --git a/IfcGeometricModelResource/IfcRevolvedAreaSolidTapered.java b/IfcGeometricModelResource/IfcRevolvedAreaSolidTapered.java deleted file mode 100644 index 72c8f688..00000000 --- a/IfcGeometricModelResource/IfcRevolvedAreaSolidTapered.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcRevolvedAreaSolidTapered extends IfcRevolvedAreaSolid - { - private IfcProfileDef EndSweptArea; - } -} diff --git a/IfcGeometricModelResource/IfcSweptDiskSolidPolygonal.java b/IfcGeometricModelResource/IfcSweptDiskSolidPolygonal.java deleted file mode 100644 index c52949f5..00000000 --- a/IfcGeometricModelResource/IfcSweptDiskSolidPolygonal.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSweptDiskSolidPolygonal extends IfcSweptDiskSolid - { - private IfcLengthMeasure FilletRadius; - } -} diff --git a/IfcGeometricModelResource/IfcTessellatedFaceSet.java b/IfcGeometricModelResource/IfcTessellatedFaceSet.java deleted file mode 100644 index 0bb48a46..00000000 --- a/IfcGeometricModelResource/IfcTessellatedFaceSet.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcTessellatedFaceSet extends IfcTessellatedItem - { - private IfcCartesianPointList3D Coordinates; - private int Dim; - private IfcIndexedColourMap[] HasColours; - private IfcIndexedTextureMap[] HasTextures; - } -} diff --git a/IfcGeometricModelResource/IfcTessellatedItem.java b/IfcGeometricModelResource/IfcTessellatedItem.java deleted file mode 100644 index 2c49980c..00000000 --- a/IfcGeometricModelResource/IfcTessellatedItem.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcTessellatedItem extends IfcGeometricRepresentationItem - { - } -} diff --git a/IfcGeometricModelResource/IfcTriangulatedFaceSet.java b/IfcGeometricModelResource/IfcTriangulatedFaceSet.java deleted file mode 100644 index 4c17b4e3..00000000 --- a/IfcGeometricModelResource/IfcTriangulatedFaceSet.java +++ /dev/null @@ -1,14 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcTriangulatedFaceSet extends IfcTessellatedFaceSet - { - private double[] Normals; - private bool Closed; - private IfcInteger[] CoordIndex; - private IfcInteger[] PnIndex; - private int NumberOfTriangles; - } -} diff --git a/IfcGeometryResource/Ifc2DCompositeCurve.java b/IfcGeometryResource/Ifc2DCompositeCurve.java new file mode 100644 index 00000000..09e8ef23 --- /dev/null +++ b/IfcGeometryResource/Ifc2DCompositeCurve.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class Ifc2DCompositeCurve extends IfcCompositeCurve + { + } +} diff --git a/IfcGeometryResource/IfcArcIndex.java b/IfcGeometryResource/IfcArcIndex.java deleted file mode 100644 index e8edbfb5..00000000 --- a/IfcGeometryResource/IfcArcIndex.java +++ /dev/null @@ -1,6 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ -} diff --git a/IfcGeometryResource/IfcBSplineCurve.java b/IfcGeometryResource/IfcBSplineCurve.java index fdec2a18..6b8c22fd 100644 --- a/IfcGeometryResource/IfcBSplineCurve.java +++ b/IfcGeometryResource/IfcBSplineCurve.java @@ -5,12 +5,12 @@ { public class IfcBSplineCurve extends IfcBoundedCurve { - private int Degree; + private INTEGER Degree; private IfcCartesianPoint[] ControlPointsList; private IfcBSplineCurveForm CurveForm; - private int ClosedCurve; - private int SelfIntersect; - private int UpperIndexOnControlPoints; + private LOGICAL ClosedCurve; + private LOGICAL SelfIntersect; private IfcCartesianPoint ControlPoints; + private INTEGER UpperIndexOnControlPoints; } } diff --git a/IfcGeometryResource/IfcBSplineCurveWithKnots.java b/IfcGeometryResource/IfcBSplineCurveWithKnots.java deleted file mode 100644 index fc8fb919..00000000 --- a/IfcGeometryResource/IfcBSplineCurveWithKnots.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcBSplineCurveWithKnots extends IfcBSplineCurve - { - private int[] KnotMultiplicities; - private double[] Knots; - private IfcKnotType KnotSpec; - private int UpperIndexOnKnots; - } -} diff --git a/IfcGeometryResource/IfcBSplineSurface.java b/IfcGeometryResource/IfcBSplineSurface.java deleted file mode 100644 index 58a7ed92..00000000 --- a/IfcGeometryResource/IfcBSplineSurface.java +++ /dev/null @@ -1,19 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcBSplineSurface extends IfcBoundedSurface - { - private int UDegree; - private int VDegree; - private IfcCartesianPoint[] ControlPointsList; - private IfcBSplineSurfaceForm SurfaceForm; - private int UClosed; - private int VClosed; - private int SelfIntersect; - private int UUpper; - private int VUpper; - private IfcCartesianPoint ControlPoints; - } -} diff --git a/IfcGeometryResource/IfcBSplineSurfaceForm.java b/IfcGeometryResource/IfcBSplineSurfaceForm.java deleted file mode 100644 index 077ddbab..00000000 --- a/IfcGeometryResource/IfcBSplineSurfaceForm.java +++ /dev/null @@ -1,20 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcBSplineSurfaceForm - { - PLANE_SURF, - CYLINDRICAL_SURF, - CONICAL_SURF, - SPHERICAL_SURF, - TOROIDAL_SURF, - SURF_OF_REVOLUTION, - RULED_SURF, - GENERALISED_CONE, - QUADRIC_SURF, - SURF_OF_LINEAR_EXTRUSION, - UNSPECIFIED, - } -} diff --git a/IfcGeometryResource/IfcBSplineSurfaceWithKnots.java b/IfcGeometryResource/IfcBSplineSurfaceWithKnots.java deleted file mode 100644 index f2bbe6d5..00000000 --- a/IfcGeometryResource/IfcBSplineSurfaceWithKnots.java +++ /dev/null @@ -1,16 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcBSplineSurfaceWithKnots extends IfcBSplineSurface - { - private int[] UMultiplicities; - private int[] VMultiplicities; - private double[] UKnots; - private double[] VKnots; - private IfcKnotType KnotSpec; - private int KnotVUpper; - private int KnotUUpper; - } -} diff --git a/IfcExternalReferenceResource/IfcExternalInformation.java b/IfcGeometryResource/IfcBezierCurve.java similarity index 78% rename from IfcExternalReferenceResource/IfcExternalInformation.java rename to IfcGeometryResource/IfcBezierCurve.java index 0fc30bba..cdf22700 100644 --- a/IfcExternalReferenceResource/IfcExternalInformation.java +++ b/IfcGeometryResource/IfcBezierCurve.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcExternalInformation extends IfcBase + public class IfcBezierCurve extends IfcBSplineCurve { } } diff --git a/IfcGeometryResource/IfcBoundaryCurve.java b/IfcGeometryResource/IfcBoundaryCurve.java deleted file mode 100644 index 2607fb52..00000000 --- a/IfcGeometryResource/IfcBoundaryCurve.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcBoundaryCurve extends IfcCompositeCurveOnSurface - { - } -} diff --git a/IfcGeometryResource/IfcCartesianTransformationOperator.java b/IfcGeometryResource/IfcCartesianTransformationOperator.java index 3f2ead74..8a2b21ce 100644 --- a/IfcGeometryResource/IfcCartesianTransformationOperator.java +++ b/IfcGeometryResource/IfcCartesianTransformationOperator.java @@ -8,8 +8,8 @@ public class IfcCartesianTransformationOperator extends IfcGeometricRepresentati private IfcDirection Axis1; private IfcDirection Axis2; private IfcCartesianPoint LocalOrigin; - private double Scale; - private double Scl; + private REAL Scale; + private REAL Scl; private int Dim; } } diff --git a/IfcGeometryResource/IfcCartesianTransformationOperator2DnonUniform.java b/IfcGeometryResource/IfcCartesianTransformationOperator2DnonUniform.java index 790f3978..b30fe4d7 100644 --- a/IfcGeometryResource/IfcCartesianTransformationOperator2DnonUniform.java +++ b/IfcGeometryResource/IfcCartesianTransformationOperator2DnonUniform.java @@ -5,7 +5,7 @@ { public class IfcCartesianTransformationOperator2DnonUniform extends IfcCartesianTransformationOperator2D { - private double Scale2; - private double Scl2; + private REAL Scale2; + private REAL Scl2; } } diff --git a/IfcGeometryResource/IfcCartesianTransformationOperator3DnonUniform.java b/IfcGeometryResource/IfcCartesianTransformationOperator3DnonUniform.java index c3bffac8..722726ff 100644 --- a/IfcGeometryResource/IfcCartesianTransformationOperator3DnonUniform.java +++ b/IfcGeometryResource/IfcCartesianTransformationOperator3DnonUniform.java @@ -5,9 +5,9 @@ { public class IfcCartesianTransformationOperator3DnonUniform extends IfcCartesianTransformationOperator3D { - private double Scale2; - private double Scale3; - private double Scl2; - private double Scl3; + private REAL Scale2; + private REAL Scale3; + private REAL Scl2; + private REAL Scl3; } } diff --git a/IfcGeometryResource/IfcCompositeCurve.java b/IfcGeometryResource/IfcCompositeCurve.java index d894db6b..e8a2540e 100644 --- a/IfcGeometryResource/IfcCompositeCurve.java +++ b/IfcGeometryResource/IfcCompositeCurve.java @@ -6,8 +6,8 @@ public class IfcCompositeCurve extends IfcBoundedCurve { private IfcCompositeCurveSegment[] Segments; - private int SelfIntersect; - private int NSegments; - private int ClosedCurve; + private LOGICAL SelfIntersect; + private INTEGER NSegments; + private LOGICAL ClosedCurve; } } diff --git a/IfcGeometryResource/IfcCompositeCurveOnSurface.java b/IfcGeometryResource/IfcCompositeCurveOnSurface.java deleted file mode 100644 index c224af9c..00000000 --- a/IfcGeometryResource/IfcCompositeCurveOnSurface.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCompositeCurveOnSurface extends IfcCompositeCurve - { - private IfcSurface[] BasisSurface; - } -} diff --git a/IfcGeometryResource/IfcCompositeCurveSegment.java b/IfcGeometryResource/IfcCompositeCurveSegment.java index 09f930a6..de8c2349 100644 --- a/IfcGeometryResource/IfcCompositeCurveSegment.java +++ b/IfcGeometryResource/IfcCompositeCurveSegment.java @@ -6,7 +6,7 @@ public class IfcCompositeCurveSegment extends IfcGeometricRepresentationItem { private IfcTransitionCode Transition; - private bool SameSense; + private BOOLEAN SameSense; private IfcCurve ParentCurve; private int Dim; private IfcCompositeCurve[] UsingCurves; diff --git a/IfcGeometryResource/IfcCurveBoundedPlane.java b/IfcGeometryResource/IfcCurveBoundedPlane.java index 755402f4..7298d6e6 100644 --- a/IfcGeometryResource/IfcCurveBoundedPlane.java +++ b/IfcGeometryResource/IfcCurveBoundedPlane.java @@ -8,5 +8,6 @@ public class IfcCurveBoundedPlane extends IfcBoundedSurface private IfcPlane BasisSurface; private IfcCurve OuterBoundary; private IfcCurve[] InnerBoundaries; + private int Dim; } } diff --git a/IfcGeometryResource/IfcCurveBoundedSurface.java b/IfcGeometryResource/IfcCurveBoundedSurface.java deleted file mode 100644 index 19a260c7..00000000 --- a/IfcGeometryResource/IfcCurveBoundedSurface.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCurveBoundedSurface extends IfcBoundedSurface - { - private IfcSurface BasisSurface; - private IfcBoundaryCurve[] Boundaries; - private bool ImplicitOuter; - } -} diff --git a/IfcGeometryResource/IfcCylindricalSurface.java b/IfcGeometryResource/IfcCylindricalSurface.java deleted file mode 100644 index 20a054a9..00000000 --- a/IfcGeometryResource/IfcCylindricalSurface.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCylindricalSurface extends IfcElementarySurface - { - private IfcLengthMeasure Radius; - } -} diff --git a/IfcGeometryResource/IfcDirection.java b/IfcGeometryResource/IfcDirection.java index 7fcfa78e..294dcc5f 100644 --- a/IfcGeometryResource/IfcDirection.java +++ b/IfcGeometryResource/IfcDirection.java @@ -5,7 +5,7 @@ { public class IfcDirection extends IfcGeometricRepresentationItem { - private double[] DirectionRatios; + private REAL[] DirectionRatios; private int Dim; } } diff --git a/IfcGeometryResource/IfcElementarySurface.java b/IfcGeometryResource/IfcElementarySurface.java index 57722433..cb3344c2 100644 --- a/IfcGeometryResource/IfcElementarySurface.java +++ b/IfcGeometryResource/IfcElementarySurface.java @@ -6,5 +6,6 @@ public class IfcElementarySurface extends IfcSurface { private IfcAxis2Placement3D Position; + private int Dim; } } diff --git a/IfcGeometryResource/IfcIndexedPolyCurve.java b/IfcGeometryResource/IfcIndexedPolyCurve.java deleted file mode 100644 index 7d66c627..00000000 --- a/IfcGeometryResource/IfcIndexedPolyCurve.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcIndexedPolyCurve extends IfcBoundedCurve - { - private IfcCartesianPointList Points; - private IfcSegmentIndexSelect[] Segments; - private bool SelfIntersect; - } -} diff --git a/IfcGeometryResource/IfcIntersectionCurve.java b/IfcGeometryResource/IfcIntersectionCurve.java deleted file mode 100644 index 49c65531..00000000 --- a/IfcGeometryResource/IfcIntersectionCurve.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcIntersectionCurve extends IfcSurfaceCurve - { - } -} diff --git a/IfcGeometryResource/IfcKnotType.java b/IfcGeometryResource/IfcKnotType.java deleted file mode 100644 index d02719b6..00000000 --- a/IfcGeometryResource/IfcKnotType.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcKnotType - { - UNIFORM_KNOTS, - QUASI_UNIFORM_KNOTS, - PIECEWISE_BEZIER_KNOTS, - UNSPECIFIED, - } -} diff --git a/IfcGeometryResource/IfcLineIndex.java b/IfcGeometryResource/IfcLineIndex.java deleted file mode 100644 index e8edbfb5..00000000 --- a/IfcGeometryResource/IfcLineIndex.java +++ /dev/null @@ -1,6 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ -} diff --git a/IfcGeometryResource/IfcOffsetCurve2D.java b/IfcGeometryResource/IfcOffsetCurve2D.java index b1f457a0..f1a5460e 100644 --- a/IfcGeometryResource/IfcOffsetCurve2D.java +++ b/IfcGeometryResource/IfcOffsetCurve2D.java @@ -7,6 +7,6 @@ public class IfcOffsetCurve2D extends IfcCurve { private IfcCurve BasisCurve; private double Distance; - private int SelfIntersect; + private LOGICAL SelfIntersect; } } diff --git a/IfcGeometryResource/IfcOffsetCurve3D.java b/IfcGeometryResource/IfcOffsetCurve3D.java index 5c371e6a..4bace133 100644 --- a/IfcGeometryResource/IfcOffsetCurve3D.java +++ b/IfcGeometryResource/IfcOffsetCurve3D.java @@ -7,7 +7,7 @@ public class IfcOffsetCurve3D extends IfcCurve { private IfcCurve BasisCurve; private double Distance; - private int SelfIntersect; + private LOGICAL SelfIntersect; private IfcDirection RefDirection; } } diff --git a/IfcGeometryResource/IfcOuterBoundaryCurve.java b/IfcGeometryResource/IfcOuterBoundaryCurve.java deleted file mode 100644 index 0571fe5f..00000000 --- a/IfcGeometryResource/IfcOuterBoundaryCurve.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcOuterBoundaryCurve extends IfcBoundaryCurve - { - } -} diff --git a/IfcGeometryResource/IfcPcurve.java b/IfcGeometryResource/IfcPcurve.java deleted file mode 100644 index d62348fd..00000000 --- a/IfcGeometryResource/IfcPcurve.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcPcurve extends IfcCurve - { - private IfcSurface BasisSurface; - private IfcCurve ReferenceCurve; - } -} diff --git a/IfcGeometryResource/IfcPreferredSurfaceCurveRepresentation.java b/IfcGeometryResource/IfcPreferredSurfaceCurveRepresentation.java deleted file mode 100644 index bdff822f..00000000 --- a/IfcGeometryResource/IfcPreferredSurfaceCurveRepresentation.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcPreferredSurfaceCurveRepresentation - { - CURVE3D, - PCURVE_S1, - PCURVE_S2, - } -} diff --git a/IfcGeometryResource/IfcRationalBSplineCurveWithKnots.java b/IfcGeometryResource/IfcRationalBSplineCurveWithKnots.java deleted file mode 100644 index 75e406dd..00000000 --- a/IfcGeometryResource/IfcRationalBSplineCurveWithKnots.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcRationalBSplineCurveWithKnots extends IfcBSplineCurveWithKnots - { - private double[] WeightsData; - private double Weights; - } -} diff --git a/IfcGeometryResource/IfcRationalBSplineSurfaceWithKnots.java b/IfcGeometryResource/IfcRationalBSplineSurfaceWithKnots.java deleted file mode 100644 index dd8350ad..00000000 --- a/IfcGeometryResource/IfcRationalBSplineSurfaceWithKnots.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcRationalBSplineSurfaceWithKnots extends IfcBSplineSurfaceWithKnots - { - private double[] WeightsData; - private double Weights; - } -} diff --git a/IfcBuildingControlsDomain/IfcController.java b/IfcGeometryResource/IfcRationalBezierCurve.java similarity index 63% rename from IfcBuildingControlsDomain/IfcController.java rename to IfcGeometryResource/IfcRationalBezierCurve.java index b39b75d3..6a8a0264 100644 --- a/IfcBuildingControlsDomain/IfcController.java +++ b/IfcGeometryResource/IfcRationalBezierCurve.java @@ -3,8 +3,9 @@ package buildingsmart.ifc { - public class IfcController extends IfcDistributionControlElement + public class IfcRationalBezierCurve extends IfcBezierCurve { - private IfcControllerTypeEnum PredefinedType; + private REAL[] WeightsData; + private REAL Weights; } } diff --git a/IfcGeometryResource/IfcRectangularTrimmedSurface.java b/IfcGeometryResource/IfcRectangularTrimmedSurface.java index 06e1ee81..4ea783b8 100644 --- a/IfcGeometryResource/IfcRectangularTrimmedSurface.java +++ b/IfcGeometryResource/IfcRectangularTrimmedSurface.java @@ -10,7 +10,8 @@ public class IfcRectangularTrimmedSurface extends IfcBoundedSurface private double V1; private double U2; private double V2; - private bool Usense; - private bool Vsense; + private BOOLEAN Usense; + private BOOLEAN Vsense; + private int Dim; } } diff --git a/IfcGeometryResource/IfcReparametrisedCompositeCurveSegment.java b/IfcGeometryResource/IfcReparametrisedCompositeCurveSegment.java deleted file mode 100644 index ef5a38b4..00000000 --- a/IfcGeometryResource/IfcReparametrisedCompositeCurveSegment.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcReparametrisedCompositeCurveSegment extends IfcCompositeCurveSegment - { - private double ParamLength; - } -} diff --git a/IfcGeometryResource/IfcRepresentationItem.java b/IfcGeometryResource/IfcRepresentationItem.java index ad587b8f..6e8394b9 100644 --- a/IfcGeometryResource/IfcRepresentationItem.java +++ b/IfcGeometryResource/IfcRepresentationItem.java @@ -5,7 +5,7 @@ { public class IfcRepresentationItem extends IfcBase { - private IfcPresentationLayerAssignment[] LayerAssignment; + private IfcPresentationLayerAssignment[] LayerAssignments; private IfcStyledItem[] StyledByItem; } } diff --git a/IfcGeometryResource/IfcRepresentationMap.java b/IfcGeometryResource/IfcRepresentationMap.java index 7fcbe888..eea6aaf7 100644 --- a/IfcGeometryResource/IfcRepresentationMap.java +++ b/IfcGeometryResource/IfcRepresentationMap.java @@ -7,7 +7,6 @@ public class IfcRepresentationMap extends IfcBase { private IfcAxis2Placement MappingOrigin; private IfcRepresentation MappedRepresentation; - private IfcShapeAspect[] HasShapeAspects; private IfcMappedItem[] MapUsage; } } diff --git a/IfcGeometryResource/IfcSeamCurve.java b/IfcGeometryResource/IfcSeamCurve.java deleted file mode 100644 index 2a34bda5..00000000 --- a/IfcGeometryResource/IfcSeamCurve.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSeamCurve extends IfcSurfaceCurve - { - } -} diff --git a/IfcGeometryResource/IfcSurface.java b/IfcGeometryResource/IfcSurface.java index a4d8be36..78d08408 100644 --- a/IfcGeometryResource/IfcSurface.java +++ b/IfcGeometryResource/IfcSurface.java @@ -5,6 +5,5 @@ { public class IfcSurface extends IfcGeometricRepresentationItem { - private int Dim; } } diff --git a/IfcGeometryResource/IfcSurfaceCurve.java b/IfcGeometryResource/IfcSurfaceCurve.java deleted file mode 100644 index 4051cc0e..00000000 --- a/IfcGeometryResource/IfcSurfaceCurve.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSurfaceCurve extends IfcCurve - { - private IfcCurve Curve3D; - private IfcPcurve[] AssociatedGeometry; - private IfcPreferredSurfaceCurveRepresentation MasterRepresentation; - private IfcSurface[] BasisSurface; - } -} diff --git a/IfcGeometryResource/IfcSweptSurface.java b/IfcGeometryResource/IfcSweptSurface.java index b7d8164b..2086de8a 100644 --- a/IfcGeometryResource/IfcSweptSurface.java +++ b/IfcGeometryResource/IfcSweptSurface.java @@ -7,5 +7,6 @@ public class IfcSweptSurface extends IfcSurface { private IfcProfileDef SweptCurve; private IfcAxis2Placement3D Position; + private int Dim; } } diff --git a/IfcGeometryResource/IfcToroidalSurface.java b/IfcGeometryResource/IfcToroidalSurface.java deleted file mode 100644 index 37cce8a9..00000000 --- a/IfcGeometryResource/IfcToroidalSurface.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcToroidalSurface extends IfcElementarySurface - { - private IfcLengthMeasure MajorRadius; - private IfcLengthMeasure MinorRadius; - } -} diff --git a/IfcGeometryResource/IfcTrimmedCurve.java b/IfcGeometryResource/IfcTrimmedCurve.java index 4c299eba..52ad077b 100644 --- a/IfcGeometryResource/IfcTrimmedCurve.java +++ b/IfcGeometryResource/IfcTrimmedCurve.java @@ -8,7 +8,7 @@ public class IfcTrimmedCurve extends IfcBoundedCurve private IfcCurve BasisCurve; private IfcTrimmingSelect[] Trim1; private IfcTrimmingSelect[] Trim2; - private bool SenseAgreement; + private BOOLEAN SenseAgreement; private IfcTrimmingPreference MasterRepresentation; } } diff --git a/IfcHvacDomain/IfcAirTerminal.java b/IfcHvacDomain/IfcAirTerminal.java deleted file mode 100644 index 341793aa..00000000 --- a/IfcHvacDomain/IfcAirTerminal.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcAirTerminal extends IfcFlowTerminal - { - private IfcAirTerminalTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcAirTerminalBox.java b/IfcHvacDomain/IfcAirTerminalBox.java deleted file mode 100644 index 66d3b9a9..00000000 --- a/IfcHvacDomain/IfcAirTerminalBox.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcAirTerminalBox extends IfcFlowController - { - private IfcAirTerminalBoxTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcAirTerminalTypeEnum.java b/IfcHvacDomain/IfcAirTerminalTypeEnum.java index 83dab4b6..a2f5e120 100644 --- a/IfcHvacDomain/IfcAirTerminalTypeEnum.java +++ b/IfcHvacDomain/IfcAirTerminalTypeEnum.java @@ -5,10 +5,13 @@ { public enum IfcAirTerminalTypeEnum { - DIFFUSER, GRILLE, - LOUVRE, REGISTER, + DIFFUSER, + EYEBALL, + IRIS, + LINEARGRILLE, + LINEARDIFFUSER, USERDEFINED, NOTDEFINED, } diff --git a/IfcHvacDomain/IfcAirToAirHeatRecovery.java b/IfcHvacDomain/IfcAirToAirHeatRecovery.java deleted file mode 100644 index e34dffe8..00000000 --- a/IfcHvacDomain/IfcAirToAirHeatRecovery.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcAirToAirHeatRecovery extends IfcEnergyConversionDevice - { - private IfcAirToAirHeatRecoveryTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcBoiler.java b/IfcHvacDomain/IfcBoiler.java deleted file mode 100644 index 2027c9e7..00000000 --- a/IfcHvacDomain/IfcBoiler.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcBoiler extends IfcEnergyConversionDevice - { - private IfcBoilerTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcBurner.java b/IfcHvacDomain/IfcBurner.java deleted file mode 100644 index 21430b7e..00000000 --- a/IfcHvacDomain/IfcBurner.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcBurner extends IfcEnergyConversionDevice - { - private IfcBurnerTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcBurnerType.java b/IfcHvacDomain/IfcBurnerType.java deleted file mode 100644 index e39fc557..00000000 --- a/IfcHvacDomain/IfcBurnerType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcBurnerType extends IfcEnergyConversionDeviceType - { - private IfcBurnerTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcChiller.java b/IfcHvacDomain/IfcChiller.java deleted file mode 100644 index 042e4d49..00000000 --- a/IfcHvacDomain/IfcChiller.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcChiller extends IfcEnergyConversionDevice - { - private IfcChillerTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcCoil.java b/IfcHvacDomain/IfcCoil.java deleted file mode 100644 index fa7e1019..00000000 --- a/IfcHvacDomain/IfcCoil.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCoil extends IfcEnergyConversionDevice - { - private IfcCoilTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcCoilTypeEnum.java b/IfcHvacDomain/IfcCoilTypeEnum.java index 130f5ccf..7406139a 100644 --- a/IfcHvacDomain/IfcCoilTypeEnum.java +++ b/IfcHvacDomain/IfcCoilTypeEnum.java @@ -6,12 +6,11 @@ public enum IfcCoilTypeEnum { DXCOOLINGCOIL, - ELECTRICHEATINGCOIL, - GASHEATINGCOIL, - HYDRONICCOIL, - STEAMHEATINGCOIL, WATERCOOLINGCOIL, + STEAMHEATINGCOIL, WATERHEATINGCOIL, + ELECTRICHEATINGCOIL, + GASHEATINGCOIL, USERDEFINED, NOTDEFINED, } diff --git a/IfcHvacDomain/IfcCompressor.java b/IfcHvacDomain/IfcCompressor.java deleted file mode 100644 index ff0d6d01..00000000 --- a/IfcHvacDomain/IfcCompressor.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCompressor extends IfcFlowMovingDevice - { - private IfcCompressorTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcCondenser.java b/IfcHvacDomain/IfcCondenser.java deleted file mode 100644 index 7dde2c4b..00000000 --- a/IfcHvacDomain/IfcCondenser.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCondenser extends IfcEnergyConversionDevice - { - private IfcCondenserTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcCondenserTypeEnum.java b/IfcHvacDomain/IfcCondenserTypeEnum.java index ff20db7c..e1687073 100644 --- a/IfcHvacDomain/IfcCondenserTypeEnum.java +++ b/IfcHvacDomain/IfcCondenserTypeEnum.java @@ -5,13 +5,12 @@ { public enum IfcCondenserTypeEnum { - AIRCOOLED, - EVAPORATIVECOOLED, - WATERCOOLED, - WATERCOOLEDBRAZEDPLATE, - WATERCOOLEDSHELLCOIL, WATERCOOLEDSHELLTUBE, + WATERCOOLEDSHELLCOIL, WATERCOOLEDTUBEINTUBE, + WATERCOOLEDBRAZEDPLATE, + AIRCOOLED, + EVAPORATIVECOOLED, USERDEFINED, NOTDEFINED, } diff --git a/IfcHvacDomain/IfcCooledBeam.java b/IfcHvacDomain/IfcCooledBeam.java deleted file mode 100644 index f8619aea..00000000 --- a/IfcHvacDomain/IfcCooledBeam.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCooledBeam extends IfcEnergyConversionDevice - { - private IfcCooledBeamTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcCoolingTower.java b/IfcHvacDomain/IfcCoolingTower.java deleted file mode 100644 index 875f1369..00000000 --- a/IfcHvacDomain/IfcCoolingTower.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCoolingTower extends IfcEnergyConversionDevice - { - private IfcCoolingTowerTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcDamper.java b/IfcHvacDomain/IfcDamper.java deleted file mode 100644 index 840c919c..00000000 --- a/IfcHvacDomain/IfcDamper.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcDamper extends IfcFlowController - { - private IfcDamperTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcDamperTypeEnum.java b/IfcHvacDomain/IfcDamperTypeEnum.java index cc3a75d6..c1cef7db 100644 --- a/IfcHvacDomain/IfcDamperTypeEnum.java +++ b/IfcHvacDomain/IfcDamperTypeEnum.java @@ -5,17 +5,17 @@ { public enum IfcDamperTypeEnum { - BACKDRAFTDAMPER, - BALANCINGDAMPER, - BLASTDAMPER, CONTROLDAMPER, FIREDAMPER, + SMOKEDAMPER, FIRESMOKEDAMPER, - FUMEHOODEXHAUST, + BACKDRAFTDAMPER, + RELIEFDAMPER, + BLASTDAMPER, GRAVITYDAMPER, GRAVITYRELIEFDAMPER, - RELIEFDAMPER, - SMOKEDAMPER, + BALANCINGDAMPER, + FUMEHOODEXHAUST, USERDEFINED, NOTDEFINED, } diff --git a/IfcHvacDomain/IfcDuctFitting.java b/IfcHvacDomain/IfcDuctFitting.java deleted file mode 100644 index f5a8c23e..00000000 --- a/IfcHvacDomain/IfcDuctFitting.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcDuctFitting extends IfcFlowFitting - { - private IfcDuctFittingTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcDuctSegment.java b/IfcHvacDomain/IfcDuctSegment.java deleted file mode 100644 index 837049bd..00000000 --- a/IfcHvacDomain/IfcDuctSegment.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcDuctSegment extends IfcFlowSegment - { - private IfcDuctSegmentTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcDuctSilencer.java b/IfcHvacDomain/IfcDuctSilencer.java deleted file mode 100644 index eaa230fd..00000000 --- a/IfcHvacDomain/IfcDuctSilencer.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcDuctSilencer extends IfcFlowTreatmentDevice - { - private IfcDuctSilencerTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcEngine.java b/IfcHvacDomain/IfcEngine.java deleted file mode 100644 index 3780b9bc..00000000 --- a/IfcHvacDomain/IfcEngine.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcEngine extends IfcEnergyConversionDevice - { - private IfcEngineTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcEngineType.java b/IfcHvacDomain/IfcEngineType.java deleted file mode 100644 index bb79b182..00000000 --- a/IfcHvacDomain/IfcEngineType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcEngineType extends IfcEnergyConversionDeviceType - { - private IfcEngineTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcEngineTypeEnum.java b/IfcHvacDomain/IfcEngineTypeEnum.java deleted file mode 100644 index d25fdd5c..00000000 --- a/IfcHvacDomain/IfcEngineTypeEnum.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcEngineTypeEnum - { - EXTERNALCOMBUSTION, - INTERNALCOMBUSTION, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcHvacDomain/IfcEvaporativeCooler.java b/IfcHvacDomain/IfcEvaporativeCooler.java deleted file mode 100644 index 865c55e8..00000000 --- a/IfcHvacDomain/IfcEvaporativeCooler.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcEvaporativeCooler extends IfcEnergyConversionDevice - { - private IfcEvaporativeCoolerTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcEvaporator.java b/IfcHvacDomain/IfcEvaporator.java deleted file mode 100644 index 82156cb0..00000000 --- a/IfcHvacDomain/IfcEvaporator.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcEvaporator extends IfcEnergyConversionDevice - { - private IfcEvaporatorTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcEvaporatorTypeEnum.java b/IfcHvacDomain/IfcEvaporatorTypeEnum.java index 15f9240e..548a5a02 100644 --- a/IfcHvacDomain/IfcEvaporatorTypeEnum.java +++ b/IfcHvacDomain/IfcEvaporatorTypeEnum.java @@ -5,7 +5,6 @@ { public enum IfcEvaporatorTypeEnum { - DIRECTEXPANSION, DIRECTEXPANSIONSHELLANDTUBE, DIRECTEXPANSIONTUBEINTUBE, DIRECTEXPANSIONBRAZEDPLATE, diff --git a/IfcHvacDomain/IfcFan.java b/IfcHvacDomain/IfcFan.java deleted file mode 100644 index f945f40a..00000000 --- a/IfcHvacDomain/IfcFan.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcFan extends IfcFlowMovingDevice - { - private IfcFanTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcFilter.java b/IfcHvacDomain/IfcFilter.java deleted file mode 100644 index dc8e1384..00000000 --- a/IfcHvacDomain/IfcFilter.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcFilter extends IfcFlowTreatmentDevice - { - private IfcFilterTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcFilterTypeEnum.java b/IfcHvacDomain/IfcFilterTypeEnum.java index e6791a6c..c121c9f5 100644 --- a/IfcHvacDomain/IfcFilterTypeEnum.java +++ b/IfcHvacDomain/IfcFilterTypeEnum.java @@ -6,7 +6,6 @@ public enum IfcFilterTypeEnum { AIRPARTICLEFILTER, - COMPRESSEDAIRFILTER, ODORFILTER, OILFILTER, STRAINER, diff --git a/IfcHvacDomain/IfcFlowMeter.java b/IfcHvacDomain/IfcFlowMeter.java deleted file mode 100644 index 307cae74..00000000 --- a/IfcHvacDomain/IfcFlowMeter.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcFlowMeter extends IfcFlowController - { - private IfcFlowMeterTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcFlowMeterTypeEnum.java b/IfcHvacDomain/IfcFlowMeterTypeEnum.java index 988bc639..ab7166c4 100644 --- a/IfcHvacDomain/IfcFlowMeterTypeEnum.java +++ b/IfcHvacDomain/IfcFlowMeterTypeEnum.java @@ -5,7 +5,9 @@ { public enum IfcFlowMeterTypeEnum { + ELECTRICMETER, ENERGYMETER, + FLOWMETER, GASMETER, OILMETER, WATERMETER, diff --git a/IfcHvacDomain/IfcGasTerminalType.java b/IfcHvacDomain/IfcGasTerminalType.java new file mode 100644 index 00000000..55980b9c --- /dev/null +++ b/IfcHvacDomain/IfcGasTerminalType.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcGasTerminalType extends IfcFlowTerminalType + { + private IfcGasTerminalTypeEnum PredefinedType; + } +} diff --git a/IfcConstructionMgmtDomain/IfcCrewResourceTypeEnum.java b/IfcHvacDomain/IfcGasTerminalTypeEnum.java similarity index 74% rename from IfcConstructionMgmtDomain/IfcCrewResourceTypeEnum.java rename to IfcHvacDomain/IfcGasTerminalTypeEnum.java index 46b5205b..831eaeae 100644 --- a/IfcConstructionMgmtDomain/IfcCrewResourceTypeEnum.java +++ b/IfcHvacDomain/IfcGasTerminalTypeEnum.java @@ -3,10 +3,11 @@ package buildingsmart.ifc { - public enum IfcCrewResourceTypeEnum + public enum IfcGasTerminalTypeEnum { - OFFICE, - SITE, + GASAPPLIANCE, + GASBOOSTER, + GASBURNER, USERDEFINED, NOTDEFINED, } diff --git a/IfcHvacDomain/IfcHeatExchanger.java b/IfcHvacDomain/IfcHeatExchanger.java deleted file mode 100644 index 44b2d4de..00000000 --- a/IfcHvacDomain/IfcHeatExchanger.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcHeatExchanger extends IfcEnergyConversionDevice - { - private IfcHeatExchangerTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcHumidifier.java b/IfcHvacDomain/IfcHumidifier.java deleted file mode 100644 index 8a3c034a..00000000 --- a/IfcHvacDomain/IfcHumidifier.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcHumidifier extends IfcEnergyConversionDevice - { - private IfcHumidifierTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcMedicalDevice.java b/IfcHvacDomain/IfcMedicalDevice.java deleted file mode 100644 index a747c6fa..00000000 --- a/IfcHvacDomain/IfcMedicalDevice.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMedicalDevice extends IfcFlowTerminal - { - private IfcMedicalDeviceTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcMedicalDeviceType.java b/IfcHvacDomain/IfcMedicalDeviceType.java deleted file mode 100644 index c51e3179..00000000 --- a/IfcHvacDomain/IfcMedicalDeviceType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMedicalDeviceType extends IfcFlowTerminalType - { - private IfcMedicalDeviceTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcMedicalDeviceTypeEnum.java b/IfcHvacDomain/IfcMedicalDeviceTypeEnum.java deleted file mode 100644 index abc9c378..00000000 --- a/IfcHvacDomain/IfcMedicalDeviceTypeEnum.java +++ /dev/null @@ -1,16 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcMedicalDeviceTypeEnum - { - AIRSTATION, - FEEDAIRUNIT, - OXYGENGENERATOR, - OXYGENPLANT, - VACUUMSTATION, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcHvacDomain/IfcPipeFitting.java b/IfcHvacDomain/IfcPipeFitting.java deleted file mode 100644 index 7dc765da..00000000 --- a/IfcHvacDomain/IfcPipeFitting.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcPipeFitting extends IfcFlowFitting - { - private IfcPipeFittingTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcPipeSegment.java b/IfcHvacDomain/IfcPipeSegment.java deleted file mode 100644 index 64320f1e..00000000 --- a/IfcHvacDomain/IfcPipeSegment.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcPipeSegment extends IfcFlowSegment - { - private IfcPipeSegmentTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcPipeSegmentTypeEnum.java b/IfcHvacDomain/IfcPipeSegmentTypeEnum.java index ef9b13da..28e38026 100644 --- a/IfcHvacDomain/IfcPipeSegmentTypeEnum.java +++ b/IfcHvacDomain/IfcPipeSegmentTypeEnum.java @@ -5,7 +5,6 @@ { public enum IfcPipeSegmentTypeEnum { - CULVERT, FLEXIBLESEGMENT, RIGIDSEGMENT, GUTTER, diff --git a/IfcHvacDomain/IfcPump.java b/IfcHvacDomain/IfcPump.java deleted file mode 100644 index 357a27eb..00000000 --- a/IfcHvacDomain/IfcPump.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcPump extends IfcFlowMovingDevice - { - private IfcPumpTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcPumpTypeEnum.java b/IfcHvacDomain/IfcPumpTypeEnum.java index 28633344..7339cb41 100644 --- a/IfcHvacDomain/IfcPumpTypeEnum.java +++ b/IfcHvacDomain/IfcPumpTypeEnum.java @@ -8,8 +8,6 @@ public enum IfcPumpTypeEnum CIRCULATOR, ENDSUCTION, SPLITCASE, - SUBMERSIBLEPUMP, - SUMPPUMP, VERTICALINLINE, VERTICALTURBINE, USERDEFINED, diff --git a/IfcHvacDomain/IfcSpaceHeater.java b/IfcHvacDomain/IfcSpaceHeater.java deleted file mode 100644 index ff1ad164..00000000 --- a/IfcHvacDomain/IfcSpaceHeater.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSpaceHeater extends IfcFlowTerminal - { - private IfcSpaceHeaterTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcSpaceHeaterType.java b/IfcHvacDomain/IfcSpaceHeaterType.java index 933e7de2..83c47dbd 100644 --- a/IfcHvacDomain/IfcSpaceHeaterType.java +++ b/IfcHvacDomain/IfcSpaceHeaterType.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcSpaceHeaterType extends IfcFlowTerminalType + public class IfcSpaceHeaterType extends IfcEnergyConversionDeviceType { private IfcSpaceHeaterTypeEnum PredefinedType; } diff --git a/IfcHvacDomain/IfcSpaceHeaterTypeEnum.java b/IfcHvacDomain/IfcSpaceHeaterTypeEnum.java index 9cbaebcd..185f1810 100644 --- a/IfcHvacDomain/IfcSpaceHeaterTypeEnum.java +++ b/IfcHvacDomain/IfcSpaceHeaterTypeEnum.java @@ -5,8 +5,13 @@ { public enum IfcSpaceHeaterTypeEnum { + SECTIONALRADIATOR, + PANELRADIATOR, + TUBULARRADIATOR, CONVECTOR, - RADIATOR, + BASEBOARDHEATER, + FINNEDTUBEUNIT, + UNITHEATER, USERDEFINED, NOTDEFINED, } diff --git a/IfcHvacDomain/IfcTank.java b/IfcHvacDomain/IfcTank.java deleted file mode 100644 index fbbe6af0..00000000 --- a/IfcHvacDomain/IfcTank.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcTank extends IfcFlowStorageDevice - { - private IfcTankTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcTankTypeEnum.java b/IfcHvacDomain/IfcTankTypeEnum.java index 3a745e8a..ddfd1bcf 100644 --- a/IfcHvacDomain/IfcTankTypeEnum.java +++ b/IfcHvacDomain/IfcTankTypeEnum.java @@ -5,13 +5,10 @@ { public enum IfcTankTypeEnum { - BASIN, - BREAKPRESSURE, + PREFORMED, + SECTIONAL, EXPANSION, - FEEDANDEXPANSION, PRESSUREVESSEL, - STORAGE, - VESSEL, USERDEFINED, NOTDEFINED, } diff --git a/IfcHvacDomain/IfcTubeBundle.java b/IfcHvacDomain/IfcTubeBundle.java deleted file mode 100644 index ce209241..00000000 --- a/IfcHvacDomain/IfcTubeBundle.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcTubeBundle extends IfcEnergyConversionDevice - { - private IfcTubeBundleTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcUnitaryEquipment.java b/IfcHvacDomain/IfcUnitaryEquipment.java deleted file mode 100644 index f0f55eea..00000000 --- a/IfcHvacDomain/IfcUnitaryEquipment.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcUnitaryEquipment extends IfcEnergyConversionDevice - { - private IfcUnitaryEquipmentTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcUnitaryEquipmentTypeEnum.java b/IfcHvacDomain/IfcUnitaryEquipmentTypeEnum.java index 243db011..7a2b7719 100644 --- a/IfcHvacDomain/IfcUnitaryEquipmentTypeEnum.java +++ b/IfcHvacDomain/IfcUnitaryEquipmentTypeEnum.java @@ -7,7 +7,6 @@ public enum IfcUnitaryEquipmentTypeEnum { AIRHANDLER, AIRCONDITIONINGUNIT, - DEHUMIDIFIER, SPLITSYSTEM, ROOFTOPUNIT, USERDEFINED, diff --git a/IfcHvacDomain/IfcValve.java b/IfcHvacDomain/IfcValve.java deleted file mode 100644 index b766cd75..00000000 --- a/IfcHvacDomain/IfcValve.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcValve extends IfcFlowController - { - private IfcValveTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcVibrationIsolator.java b/IfcHvacDomain/IfcVibrationIsolator.java deleted file mode 100644 index 731246e0..00000000 --- a/IfcHvacDomain/IfcVibrationIsolator.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcVibrationIsolator extends IfcElementComponent - { - private IfcVibrationIsolatorTypeEnum PredefinedType; - } -} diff --git a/IfcHvacDomain/IfcVibrationIsolatorType.java b/IfcHvacDomain/IfcVibrationIsolatorType.java index bf9fbcd2..5f5adf75 100644 --- a/IfcHvacDomain/IfcVibrationIsolatorType.java +++ b/IfcHvacDomain/IfcVibrationIsolatorType.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcVibrationIsolatorType extends IfcElementComponentType + public class IfcVibrationIsolatorType extends IfcDiscreteAccessoryType { private IfcVibrationIsolatorTypeEnum PredefinedType; } diff --git a/IfcKernel/IfcComplexPropertyTemplate.java b/IfcKernel/IfcComplexPropertyTemplate.java deleted file mode 100644 index d930a373..00000000 --- a/IfcKernel/IfcComplexPropertyTemplate.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcComplexPropertyTemplate extends IfcPropertyTemplate - { - private string UsageName; - private IfcComplexPropertyTemplateTypeEnum TemplateType; - private IfcPropertyTemplate[] HasPropertyTemplates; - } -} diff --git a/IfcKernel/IfcComplexPropertyTemplateTypeEnum.java b/IfcKernel/IfcComplexPropertyTemplateTypeEnum.java deleted file mode 100644 index aa7ca30e..00000000 --- a/IfcKernel/IfcComplexPropertyTemplateTypeEnum.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcComplexPropertyTemplateTypeEnum - { - P_COMPLEX, - Q_COMPLEX, - } -} diff --git a/IfcKernel/IfcContext.java b/IfcKernel/IfcContext.java deleted file mode 100644 index 6c8f9c0d..00000000 --- a/IfcKernel/IfcContext.java +++ /dev/null @@ -1,16 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcContext extends IfcObjectDefinition - { - private string ObjectType; - private string LongName; - private string Phase; - private IfcRepresentationContext[] RepresentationContexts; - private IfcUnitAssignment UnitsInContext; - private IfcRelDefinesByProperties[] IsDefinedBy; - private IfcRelDeclares[] Declares; - } -} diff --git a/IfcKernel/IfcControl.java b/IfcKernel/IfcControl.java index ccd719b3..824a0b68 100644 --- a/IfcKernel/IfcControl.java +++ b/IfcKernel/IfcControl.java @@ -5,7 +5,6 @@ { public class IfcControl extends IfcObject { - private string Identification; private IfcRelAssignsToControl[] Controls; } } diff --git a/IfcKernel/IfcGroup.java b/IfcKernel/IfcGroup.java index c4134253..d88e2032 100644 --- a/IfcKernel/IfcGroup.java +++ b/IfcKernel/IfcGroup.java @@ -5,6 +5,6 @@ { public class IfcGroup extends IfcObject { - private IfcRelAssignsToGroup[] IsGroupedBy; + private IfcRelAssignsToGroup IsGroupedBy; } } diff --git a/IfcKernel/IfcObject.java b/IfcKernel/IfcObject.java index 80fe3e2d..1f12ae70 100644 --- a/IfcKernel/IfcObject.java +++ b/IfcKernel/IfcObject.java @@ -6,9 +6,6 @@ public class IfcObject extends IfcObjectDefinition { private string ObjectType; - private IfcRelDefinesByObject[] IsDeclaredBy; - private IfcRelDefinesByObject[] Declares; - private IfcRelDefinesByType[] IsTypedBy; - private IfcRelDefinesByProperties[] IsDefinedBy; + private IfcRelDefines[] IsDefinedBy; } } diff --git a/IfcKernel/IfcObjectDefinition.java b/IfcKernel/IfcObjectDefinition.java index dec9a4f0..86eaa0e8 100644 --- a/IfcKernel/IfcObjectDefinition.java +++ b/IfcKernel/IfcObjectDefinition.java @@ -6,11 +6,8 @@ public class IfcObjectDefinition extends IfcRoot { private IfcRelAssigns[] HasAssignments; - private IfcRelNests[] Nests; - private IfcRelNests[] IsNestedBy; - private IfcRelDeclares[] HasContext; - private IfcRelAggregates[] IsDecomposedBy; - private IfcRelAggregates[] Decomposes; + private IfcRelDecomposes[] IsDecomposedBy; + private IfcRelDecomposes[] Decomposes; private IfcRelAssociates[] HasAssociations; } } diff --git a/IfcKernel/IfcPreDefinedPropertySet.java b/IfcKernel/IfcPreDefinedPropertySet.java deleted file mode 100644 index 92675a37..00000000 --- a/IfcKernel/IfcPreDefinedPropertySet.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcPreDefinedPropertySet extends IfcPropertySetDefinition - { - } -} diff --git a/IfcKernel/IfcProcess.java b/IfcKernel/IfcProcess.java index 2c3ec66b..4ad05fe3 100644 --- a/IfcKernel/IfcProcess.java +++ b/IfcKernel/IfcProcess.java @@ -5,10 +5,8 @@ { public class IfcProcess extends IfcObject { - private string Identification; - private string LongDescription; - private IfcRelSequence[] IsPredecessorTo; - private IfcRelSequence[] IsSuccessorFrom; private IfcRelAssignsToProcess[] OperatesOn; + private IfcRelSequence[] IsSuccessorFrom; + private IfcRelSequence[] IsPredecessorTo; } } diff --git a/IfcKernel/IfcProductSelect.java b/IfcKernel/IfcProductSelect.java deleted file mode 100644 index cb187dac..00000000 --- a/IfcKernel/IfcProductSelect.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public interface IfcProductSelect - { - } -} diff --git a/IfcKernel/IfcProject.java b/IfcKernel/IfcProject.java index f4b5ab42..abc564cb 100644 --- a/IfcKernel/IfcProject.java +++ b/IfcKernel/IfcProject.java @@ -3,7 +3,11 @@ package buildingsmart.ifc { - public class IfcProject extends IfcContext + public class IfcProject extends IfcObject { + private string LongName; + private string Phase; + private IfcRepresentationContext[] RepresentationContexts; + private IfcUnitAssignment UnitsInContext; } } diff --git a/IfcKernel/IfcProjectLibrary.java b/IfcKernel/IfcProjectLibrary.java deleted file mode 100644 index 112fcc1e..00000000 --- a/IfcKernel/IfcProjectLibrary.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcProjectLibrary extends IfcContext - { - } -} diff --git a/IfcKernel/IfcPropertyDefinition.java b/IfcKernel/IfcPropertyDefinition.java index 510df79b..665f831d 100644 --- a/IfcKernel/IfcPropertyDefinition.java +++ b/IfcKernel/IfcPropertyDefinition.java @@ -5,7 +5,6 @@ { public class IfcPropertyDefinition extends IfcRoot { - private IfcRelDeclares[] HasContext; private IfcRelAssociates[] HasAssociations; } } diff --git a/IfcKernel/IfcPropertySetDefinition.java b/IfcKernel/IfcPropertySetDefinition.java index 2a558c0c..e921dc04 100644 --- a/IfcKernel/IfcPropertySetDefinition.java +++ b/IfcKernel/IfcPropertySetDefinition.java @@ -5,8 +5,7 @@ { public class IfcPropertySetDefinition extends IfcPropertyDefinition { + private IfcRelDefinesByProperties[] PropertyDefinitionOf; private IfcTypeObject[] DefinesType; - private IfcRelDefinesByTemplate[] IsDefinedBy; - private IfcRelDefinesByProperties[] DefinesOccurrence; } } diff --git a/IfcKernel/IfcPropertySetDefinitionSelect.java b/IfcKernel/IfcPropertySetDefinitionSelect.java deleted file mode 100644 index 293f79cb..00000000 --- a/IfcKernel/IfcPropertySetDefinitionSelect.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public interface IfcPropertySetDefinitionSelect - { - } -} diff --git a/IfcKernel/IfcPropertySetDefinitionSet.java b/IfcKernel/IfcPropertySetDefinitionSet.java deleted file mode 100644 index e8edbfb5..00000000 --- a/IfcKernel/IfcPropertySetDefinitionSet.java +++ /dev/null @@ -1,6 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ -} diff --git a/IfcKernel/IfcPropertySetTemplate.java b/IfcKernel/IfcPropertySetTemplate.java deleted file mode 100644 index 82bf179c..00000000 --- a/IfcKernel/IfcPropertySetTemplate.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcPropertySetTemplate extends IfcPropertyTemplateDefinition - { - private IfcPropertySetTemplateTypeEnum TemplateType; - private string ApplicableEntity; - private IfcPropertyTemplate[] HasPropertyTemplates; - private IfcRelDefinesByTemplate[] Defines; - } -} diff --git a/IfcKernel/IfcPropertySetTemplateTypeEnum.java b/IfcKernel/IfcPropertySetTemplateTypeEnum.java deleted file mode 100644 index 5ed069f4..00000000 --- a/IfcKernel/IfcPropertySetTemplateTypeEnum.java +++ /dev/null @@ -1,17 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcPropertySetTemplateTypeEnum - { - PSET_TYPEDRIVENONLY, - PSET_TYPEDRIVENOVERRIDE, - PSET_OCCURRENCEDRIVEN, - PSET_PERFORMANCEDRIVEN, - QTO_TYPEDRIVENONLY, - QTO_TYPEDRIVENOVERRIDE, - QTO_OCCURRENCEDRIVEN, - NOTDEFINED, - } -} diff --git a/IfcKernel/IfcPropertyTemplate.java b/IfcKernel/IfcPropertyTemplate.java deleted file mode 100644 index 1ad050c7..00000000 --- a/IfcKernel/IfcPropertyTemplate.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcPropertyTemplate extends IfcPropertyTemplateDefinition - { - private IfcComplexPropertyTemplate[] PartOfComplexTemplate; - private IfcPropertySetTemplate[] PartOfPsetTemplate; - } -} diff --git a/IfcKernel/IfcPropertyTemplateDefinition.java b/IfcKernel/IfcPropertyTemplateDefinition.java deleted file mode 100644 index 34308d75..00000000 --- a/IfcKernel/IfcPropertyTemplateDefinition.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcPropertyTemplateDefinition extends IfcPropertyDefinition - { - } -} diff --git a/IfcKernel/IfcQuantitySet.java b/IfcKernel/IfcQuantitySet.java deleted file mode 100644 index 09c8c97c..00000000 --- a/IfcKernel/IfcQuantitySet.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcQuantitySet extends IfcPropertySetDefinition - { - } -} diff --git a/IfcKernel/IfcRelAggregates.java b/IfcKernel/IfcRelAggregates.java index 46275757..43449b23 100644 --- a/IfcKernel/IfcRelAggregates.java +++ b/IfcKernel/IfcRelAggregates.java @@ -5,7 +5,5 @@ { public class IfcRelAggregates extends IfcRelDecomposes { - private IfcObjectDefinition RelatingObject; - private IfcObjectDefinition[] RelatedObjects; } } diff --git a/IfcKernel/IfcRelAssignsToGroupByFactor.java b/IfcKernel/IfcRelAssignsToGroupByFactor.java deleted file mode 100644 index 2722b70c..00000000 --- a/IfcKernel/IfcRelAssignsToGroupByFactor.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcRelAssignsToGroupByFactor extends IfcRelAssignsToGroup - { - private double Factor; - } -} diff --git a/IfcKernel/IfcRelAssignsToProcess.java b/IfcKernel/IfcRelAssignsToProcess.java index 085346bb..ca36851e 100644 --- a/IfcKernel/IfcRelAssignsToProcess.java +++ b/IfcKernel/IfcRelAssignsToProcess.java @@ -5,7 +5,7 @@ { public class IfcRelAssignsToProcess extends IfcRelAssigns { - private IfcProcessSelect RelatingProcess; + private IfcProcess RelatingProcess; private IfcMeasureWithUnit QuantityInProcess; } } diff --git a/IfcKernel/IfcRelAssignsToProduct.java b/IfcKernel/IfcRelAssignsToProduct.java index 587a3538..98860028 100644 --- a/IfcKernel/IfcRelAssignsToProduct.java +++ b/IfcKernel/IfcRelAssignsToProduct.java @@ -5,6 +5,6 @@ { public class IfcRelAssignsToProduct extends IfcRelAssigns { - private IfcProductSelect RelatingProduct; + private IfcProduct RelatingProduct; } } diff --git a/IfcKernel/IfcRelAssignsToResource.java b/IfcKernel/IfcRelAssignsToResource.java index 20c3b93b..f3b2f669 100644 --- a/IfcKernel/IfcRelAssignsToResource.java +++ b/IfcKernel/IfcRelAssignsToResource.java @@ -5,6 +5,6 @@ { public class IfcRelAssignsToResource extends IfcRelAssigns { - private IfcResourceSelect RelatingResource; + private IfcResource RelatingResource; } } diff --git a/IfcKernel/IfcRelAssociates.java b/IfcKernel/IfcRelAssociates.java index 3457868c..a69d7f2f 100644 --- a/IfcKernel/IfcRelAssociates.java +++ b/IfcKernel/IfcRelAssociates.java @@ -5,6 +5,6 @@ { public class IfcRelAssociates extends IfcRelationship { - private IfcDefinitionSelect[] RelatedObjects; + private IfcRoot[] RelatedObjects; } } diff --git a/IfcKernel/IfcRelAssociatesClassification.java b/IfcKernel/IfcRelAssociatesClassification.java index 0c33d962..74b70b1a 100644 --- a/IfcKernel/IfcRelAssociatesClassification.java +++ b/IfcKernel/IfcRelAssociatesClassification.java @@ -5,6 +5,6 @@ { public class IfcRelAssociatesClassification extends IfcRelAssociates { - private IfcClassificationSelect RelatingClassification; + private IfcClassificationNotationSelect RelatingClassification; } } diff --git a/IfcKernel/IfcRelDeclares.java b/IfcKernel/IfcRelDeclares.java deleted file mode 100644 index 5c37c6ab..00000000 --- a/IfcKernel/IfcRelDeclares.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcRelDeclares extends IfcRelationship - { - private IfcContext RelatingContext; - private IfcDefinitionSelect[] RelatedDefinitions; - } -} diff --git a/IfcKernel/IfcRelDecomposes.java b/IfcKernel/IfcRelDecomposes.java index b7613166..7246d659 100644 --- a/IfcKernel/IfcRelDecomposes.java +++ b/IfcKernel/IfcRelDecomposes.java @@ -5,5 +5,7 @@ { public class IfcRelDecomposes extends IfcRelationship { + private IfcObjectDefinition RelatingObject; + private IfcObjectDefinition[] RelatedObjects; } } diff --git a/IfcKernel/IfcRelDefines.java b/IfcKernel/IfcRelDefines.java index d4c9e477..98bc664f 100644 --- a/IfcKernel/IfcRelDefines.java +++ b/IfcKernel/IfcRelDefines.java @@ -5,5 +5,6 @@ { public class IfcRelDefines extends IfcRelationship { + private IfcObject[] RelatedObjects; } } diff --git a/IfcKernel/IfcRelDefinesByObject.java b/IfcKernel/IfcRelDefinesByObject.java deleted file mode 100644 index 5acb43f6..00000000 --- a/IfcKernel/IfcRelDefinesByObject.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcRelDefinesByObject extends IfcRelDefines - { - private IfcObject[] RelatedObjects; - private IfcObject RelatingObject; - } -} diff --git a/IfcKernel/IfcRelDefinesByProperties.java b/IfcKernel/IfcRelDefinesByProperties.java index 6a44ad61..938ae1e2 100644 --- a/IfcKernel/IfcRelDefinesByProperties.java +++ b/IfcKernel/IfcRelDefinesByProperties.java @@ -5,7 +5,6 @@ { public class IfcRelDefinesByProperties extends IfcRelDefines { - private IfcObjectDefinition[] RelatedObjects; - private IfcPropertySetDefinitionSelect RelatingPropertyDefinition; + private IfcPropertySetDefinition RelatingPropertyDefinition; } } diff --git a/IfcKernel/IfcRelDefinesByTemplate.java b/IfcKernel/IfcRelDefinesByTemplate.java deleted file mode 100644 index ef9a26b9..00000000 --- a/IfcKernel/IfcRelDefinesByTemplate.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcRelDefinesByTemplate extends IfcRelDefines - { - private IfcPropertySetDefinition[] RelatedPropertySets; - private IfcPropertySetTemplate RelatingTemplate; - } -} diff --git a/IfcKernel/IfcRelDefinesByType.java b/IfcKernel/IfcRelDefinesByType.java index ed5de24e..0be7d359 100644 --- a/IfcKernel/IfcRelDefinesByType.java +++ b/IfcKernel/IfcRelDefinesByType.java @@ -5,7 +5,6 @@ { public class IfcRelDefinesByType extends IfcRelDefines { - private IfcObject[] RelatedObjects; private IfcTypeObject RelatingType; } } diff --git a/IfcKernel/IfcRelNests.java b/IfcKernel/IfcRelNests.java index 060d13d2..088e6a9b 100644 --- a/IfcKernel/IfcRelNests.java +++ b/IfcKernel/IfcRelNests.java @@ -5,7 +5,5 @@ { public class IfcRelNests extends IfcRelDecomposes { - private IfcObjectDefinition RelatingObject; - private IfcObjectDefinition[] RelatedObjects; } } diff --git a/IfcKernel/IfcRelOverridesProperties.java b/IfcKernel/IfcRelOverridesProperties.java new file mode 100644 index 00000000..d16609e3 --- /dev/null +++ b/IfcKernel/IfcRelOverridesProperties.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcRelOverridesProperties extends IfcRelDefinesByProperties + { + private IfcProperty[] OverridingProperties; + } +} diff --git a/IfcProcessExtension/IfcRelSequence.java b/IfcKernel/IfcRelSequence.java similarity index 83% rename from IfcProcessExtension/IfcRelSequence.java rename to IfcKernel/IfcRelSequence.java index 470b35a7..0e8c2f02 100644 --- a/IfcProcessExtension/IfcRelSequence.java +++ b/IfcKernel/IfcRelSequence.java @@ -7,8 +7,7 @@ public class IfcRelSequence extends IfcRelConnects { private IfcProcess RelatingProcess; private IfcProcess RelatedProcess; - private IfcLagTime TimeLag; + private double TimeLag; private IfcSequenceEnum SequenceType; - private string UserDefinedSequenceType; } } diff --git a/IfcKernel/IfcResource.java b/IfcKernel/IfcResource.java index 49f6c206..9d48a40f 100644 --- a/IfcKernel/IfcResource.java +++ b/IfcKernel/IfcResource.java @@ -5,8 +5,6 @@ { public class IfcResource extends IfcObject { - private string Identification; - private string LongDescription; private IfcRelAssignsToResource[] ResourceOf; } } diff --git a/IfcKernel/IfcResourceSelect.java b/IfcKernel/IfcResourceSelect.java deleted file mode 100644 index 2d8e7ccf..00000000 --- a/IfcKernel/IfcResourceSelect.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public interface IfcResourceSelect - { - } -} diff --git a/IfcProcessExtension/IfcSequenceEnum.java b/IfcKernel/IfcSequenceEnum.java similarity index 95% rename from IfcProcessExtension/IfcSequenceEnum.java rename to IfcKernel/IfcSequenceEnum.java index fd4eb304..1690dc69 100644 --- a/IfcProcessExtension/IfcSequenceEnum.java +++ b/IfcKernel/IfcSequenceEnum.java @@ -9,7 +9,6 @@ public enum IfcSequenceEnum START_FINISH, FINISH_START, FINISH_FINISH, - USERDEFINED, NOTDEFINED, } } diff --git a/IfcKernel/IfcSimplePropertyTemplate.java b/IfcKernel/IfcSimplePropertyTemplate.java deleted file mode 100644 index 1c41dbdc..00000000 --- a/IfcKernel/IfcSimplePropertyTemplate.java +++ /dev/null @@ -1,17 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSimplePropertyTemplate extends IfcPropertyTemplate - { - private IfcSimplePropertyTemplateTypeEnum TemplateType; - private string PrimaryMeasureType; - private string SecondaryMeasureType; - private IfcPropertyEnumeration Enumerators; - private IfcUnit PrimaryUnit; - private IfcUnit SecondaryUnit; - private string Expression; - private IfcStateEnum AccessState; - } -} diff --git a/IfcKernel/IfcSimplePropertyTemplateTypeEnum.java b/IfcKernel/IfcSimplePropertyTemplateTypeEnum.java deleted file mode 100644 index 5b39a478..00000000 --- a/IfcKernel/IfcSimplePropertyTemplateTypeEnum.java +++ /dev/null @@ -1,21 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcSimplePropertyTemplateTypeEnum - { - P_SINGLEVALUE, - P_ENUMERATEDVALUE, - P_BOUNDEDVALUE, - P_LISTVALUE, - P_TABLEVALUE, - P_REFERENCEVALUE, - Q_LENGTH, - Q_AREA, - Q_VOLUME, - Q_COUNT, - Q_WEIGHT, - Q_TIME, - } -} diff --git a/IfcKernel/IfcTypeObject.java b/IfcKernel/IfcTypeObject.java index 8e71017b..b5b0ebbe 100644 --- a/IfcKernel/IfcTypeObject.java +++ b/IfcKernel/IfcTypeObject.java @@ -7,6 +7,6 @@ public class IfcTypeObject extends IfcObjectDefinition { private string ApplicableOccurrence; private IfcPropertySetDefinition[] HasPropertySets; - private IfcRelDefinesByType[] Types; + private IfcRelDefinesByType[] ObjectTypeOf; } } diff --git a/IfcKernel/IfcTypeProcess.java b/IfcKernel/IfcTypeProcess.java deleted file mode 100644 index 6c9a838d..00000000 --- a/IfcKernel/IfcTypeProcess.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcTypeProcess extends IfcTypeObject - { - private string Identification; - private string LongDescription; - private string ProcessType; - private IfcRelAssignsToProcess[] OperatesOn; - } -} diff --git a/IfcKernel/IfcTypeProduct.java b/IfcKernel/IfcTypeProduct.java index 79202ef4..30c07292 100644 --- a/IfcKernel/IfcTypeProduct.java +++ b/IfcKernel/IfcTypeProduct.java @@ -7,6 +7,5 @@ public class IfcTypeProduct extends IfcTypeObject { private IfcRepresentationMap[] RepresentationMaps; private string Tag; - private IfcRelAssignsToProduct[] ReferencedBy; } } diff --git a/IfcKernel/IfcTypeResource.java b/IfcKernel/IfcTypeResource.java deleted file mode 100644 index 6fcd8a71..00000000 --- a/IfcKernel/IfcTypeResource.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcTypeResource extends IfcTypeObject - { - private string Identification; - private string LongDescription; - private string ResourceType; - private IfcRelAssignsToResource[] ResourceOf; - } -} diff --git a/IfcMaterialResource/IfcCardinalPointReference.java b/IfcMaterialResource/IfcCardinalPointReference.java deleted file mode 100644 index e8edbfb5..00000000 --- a/IfcMaterialResource/IfcCardinalPointReference.java +++ /dev/null @@ -1,6 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ -} diff --git a/IfcMaterialResource/IfcMaterial.java b/IfcMaterialResource/IfcMaterial.java index 8a8ab940..21c272fa 100644 --- a/IfcMaterialResource/IfcMaterial.java +++ b/IfcMaterialResource/IfcMaterial.java @@ -3,13 +3,10 @@ package buildingsmart.ifc { - public class IfcMaterial extends IfcMaterialDefinition + public class IfcMaterial extends IfcBase { private string Name; - private string Description; - private string Category; private IfcMaterialDefinitionRepresentation[] HasRepresentation; - private IfcMaterialRelationship[] IsRelatedWith; - private IfcMaterialRelationship[] RelatesTo; + private IfcMaterialClassificationRelationship[] ClassifiedAs; } } diff --git a/IfcMaterialResource/IfcMaterialClassificationRelationship.java b/IfcMaterialResource/IfcMaterialClassificationRelationship.java index 0eafd33f..96a326e8 100644 --- a/IfcMaterialResource/IfcMaterialClassificationRelationship.java +++ b/IfcMaterialResource/IfcMaterialClassificationRelationship.java @@ -5,7 +5,7 @@ { public class IfcMaterialClassificationRelationship extends IfcBase { - private IfcClassificationSelect[] MaterialClassifications; + private IfcClassificationNotationSelect[] MaterialClassifications; private IfcMaterial ClassifiedMaterial; } } diff --git a/IfcMaterialResource/IfcMaterialConstituent.java b/IfcMaterialResource/IfcMaterialConstituent.java deleted file mode 100644 index b582bad7..00000000 --- a/IfcMaterialResource/IfcMaterialConstituent.java +++ /dev/null @@ -1,15 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMaterialConstituent extends IfcMaterialDefinition - { - private string Name; - private string Description; - private IfcMaterial Material; - private IfcRatioMeasure Fraction; - private string Category; - private IfcMaterialConstituentSet ToMaterialConstituentSet; - } -} diff --git a/IfcMaterialResource/IfcMaterialDefinition.java b/IfcMaterialResource/IfcMaterialDefinition.java deleted file mode 100644 index 17470bd8..00000000 --- a/IfcMaterialResource/IfcMaterialDefinition.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMaterialDefinition extends IfcBase - { - private IfcRelAssociatesMaterial[] AssociatedTo; - private IfcExternalReferenceRelationship[] HasExternalReferences; - private IfcMaterialProperties[] HasProperties; - } -} diff --git a/IfcMaterialResource/IfcMaterialLayer.java b/IfcMaterialResource/IfcMaterialLayer.java index 122b0f29..3e51b80a 100644 --- a/IfcMaterialResource/IfcMaterialLayer.java +++ b/IfcMaterialResource/IfcMaterialLayer.java @@ -3,15 +3,11 @@ package buildingsmart.ifc { - public class IfcMaterialLayer extends IfcMaterialDefinition + public class IfcMaterialLayer extends IfcBase { private IfcMaterial Material; private IfcLengthMeasure LayerThickness; private int IsVentilated; - private string Name; - private string Description; - private string Category; - private int Priority; private IfcMaterialLayerSet ToMaterialLayerSet; } } diff --git a/IfcMaterialResource/IfcMaterialLayerSet.java b/IfcMaterialResource/IfcMaterialLayerSet.java index 492a355a..52c080e0 100644 --- a/IfcMaterialResource/IfcMaterialLayerSet.java +++ b/IfcMaterialResource/IfcMaterialLayerSet.java @@ -3,11 +3,10 @@ package buildingsmart.ifc { - public class IfcMaterialLayerSet extends IfcMaterialDefinition + public class IfcMaterialLayerSet extends IfcBase { private IfcMaterialLayer[] MaterialLayers; private string LayerSetName; - private string Description; private double TotalThickness; } } diff --git a/IfcMaterialResource/IfcMaterialLayerSetUsage.java b/IfcMaterialResource/IfcMaterialLayerSetUsage.java index b3e9733c..d53b4da2 100644 --- a/IfcMaterialResource/IfcMaterialLayerSetUsage.java +++ b/IfcMaterialResource/IfcMaterialLayerSetUsage.java @@ -3,12 +3,11 @@ package buildingsmart.ifc { - public class IfcMaterialLayerSetUsage extends IfcMaterialUsageDefinition + public class IfcMaterialLayerSetUsage extends IfcBase { private IfcMaterialLayerSet ForLayerSet; private IfcLayerSetDirectionEnum LayerSetDirection; private IfcDirectionSenseEnum DirectionSense; private double OffsetFromReferenceLine; - private IfcLengthMeasure ReferenceExtent; } } diff --git a/IfcMaterialResource/IfcMaterialLayerWithOffsets.java b/IfcMaterialResource/IfcMaterialLayerWithOffsets.java deleted file mode 100644 index 8be9a032..00000000 --- a/IfcMaterialResource/IfcMaterialLayerWithOffsets.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMaterialLayerWithOffsets extends IfcMaterialLayer - { - private IfcLayerSetDirectionEnum OffsetDirection; - private double OffsetValues; - } -} diff --git a/IfcMaterialResource/IfcMaterialProfile.java b/IfcMaterialResource/IfcMaterialProfile.java deleted file mode 100644 index 0f34d029..00000000 --- a/IfcMaterialResource/IfcMaterialProfile.java +++ /dev/null @@ -1,16 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMaterialProfile extends IfcMaterialDefinition - { - private string Name; - private string Description; - private IfcMaterial Material; - private IfcProfileDef Profile; - private int Priority; - private string Category; - private IfcMaterialProfileSet ToMaterialProfileSet; - } -} diff --git a/IfcMaterialResource/IfcMaterialProfileSetUsage.java b/IfcMaterialResource/IfcMaterialProfileSetUsage.java deleted file mode 100644 index f497b9f5..00000000 --- a/IfcMaterialResource/IfcMaterialProfileSetUsage.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMaterialProfileSetUsage extends IfcMaterialUsageDefinition - { - private IfcMaterialProfileSet ForProfileSet; - private int CardinalPoint; - private IfcLengthMeasure ReferenceExtent; - } -} diff --git a/IfcMaterialResource/IfcMaterialProfileSetUsageTapering.java b/IfcMaterialResource/IfcMaterialProfileSetUsageTapering.java deleted file mode 100644 index 3f97216e..00000000 --- a/IfcMaterialResource/IfcMaterialProfileSetUsageTapering.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMaterialProfileSetUsageTapering extends IfcMaterialProfileSetUsage - { - private IfcMaterialProfileSet ForProfileEndSet; - private int CardinalEndPoint; - } -} diff --git a/IfcMaterialResource/IfcMaterialProfileWithOffsets.java b/IfcMaterialResource/IfcMaterialProfileWithOffsets.java deleted file mode 100644 index dc8d2a7e..00000000 --- a/IfcMaterialResource/IfcMaterialProfileWithOffsets.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMaterialProfileWithOffsets extends IfcMaterialProfile - { - private double OffsetValues; - } -} diff --git a/IfcMaterialResource/IfcMaterialProperties.java b/IfcMaterialResource/IfcMaterialProperties.java deleted file mode 100644 index 6c6f04fe..00000000 --- a/IfcMaterialResource/IfcMaterialProperties.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMaterialProperties extends IfcExtendedProperties - { - private IfcMaterialDefinition Material; - } -} diff --git a/IfcMaterialResource/IfcMaterialRelationship.java b/IfcMaterialResource/IfcMaterialRelationship.java deleted file mode 100644 index 76faf446..00000000 --- a/IfcMaterialResource/IfcMaterialRelationship.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMaterialRelationship extends IfcResourceLevelRelationship - { - private IfcMaterial RelatingMaterial; - private IfcMaterial[] RelatedMaterials; - private string Expression; - } -} diff --git a/IfcMaterialResource/IfcMaterialUsageDefinition.java b/IfcMaterialResource/IfcMaterialUsageDefinition.java deleted file mode 100644 index 249879bc..00000000 --- a/IfcMaterialResource/IfcMaterialUsageDefinition.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMaterialUsageDefinition extends IfcBase - { - private IfcRelAssociatesMaterial[] AssociatedTo; - } -} diff --git a/IfcMeasureResource/IfcAreaDensityMeasure.java b/IfcMeasureResource/IfcAreaDensityMeasure.java deleted file mode 100644 index e8edbfb5..00000000 --- a/IfcMeasureResource/IfcAreaDensityMeasure.java +++ /dev/null @@ -1,6 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ -} diff --git a/IfcMeasureResource/IfcBinary.java b/IfcMeasureResource/IfcBinary.java deleted file mode 100644 index e8edbfb5..00000000 --- a/IfcMeasureResource/IfcBinary.java +++ /dev/null @@ -1,6 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ -} diff --git a/IfcMeasureResource/IfcContextDependentUnit.java b/IfcMeasureResource/IfcContextDependentUnit.java index 73dcdcd7..fe51947f 100644 --- a/IfcMeasureResource/IfcContextDependentUnit.java +++ b/IfcMeasureResource/IfcContextDependentUnit.java @@ -6,6 +6,5 @@ public class IfcContextDependentUnit extends IfcNamedUnit { private string Name; - private IfcExternalReferenceRelationship[] HasExternalReference; } } diff --git a/IfcMeasureResource/IfcConversionBasedUnit.java b/IfcMeasureResource/IfcConversionBasedUnit.java index 4df00ec3..4838c8a9 100644 --- a/IfcMeasureResource/IfcConversionBasedUnit.java +++ b/IfcMeasureResource/IfcConversionBasedUnit.java @@ -7,6 +7,5 @@ public class IfcConversionBasedUnit extends IfcNamedUnit { private string Name; private IfcMeasureWithUnit ConversionFactor; - private IfcExternalReferenceRelationship[] HasExternalReference; } } diff --git a/IfcMeasureResource/IfcConversionBasedUnitWithOffset.java b/IfcMeasureResource/IfcConversionBasedUnitWithOffset.java deleted file mode 100644 index 9d96657b..00000000 --- a/IfcMeasureResource/IfcConversionBasedUnitWithOffset.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcConversionBasedUnitWithOffset extends IfcConversionBasedUnit - { - private double ConversionOffset; - } -} diff --git a/IfcMeasureResource/IfcCurrencyEnum.java b/IfcMeasureResource/IfcCurrencyEnum.java new file mode 100644 index 00000000..403bd735 --- /dev/null +++ b/IfcMeasureResource/IfcCurrencyEnum.java @@ -0,0 +1,92 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public enum IfcCurrencyEnum + { + AED, + AES, + ATS, + AUD, + BBD, + BEG, + BGL, + BHD, + BMD, + BND, + BRL, + BSD, + BWP, + BZD, + CAD, + CBD, + CHF, + CLP, + CNY, + CYS, + CZK, + DDP, + DEM, + DKK, + EGL, + EST, + EUR, + FAK, + FIM, + FJD, + FKP, + FRF, + GBP, + GIP, + GMD, + GRX, + HKD, + HUF, + ICK, + IDR, + ILS, + INR, + IRP, + ITL, + JMD, + JOD, + JPY, + KES, + KRW, + KWD, + KYD, + LKR, + LUF, + MTL, + MUR, + MXN, + MYR, + NLG, + NZD, + OMR, + PGK, + PHP, + PKR, + PLN, + PTN, + QAR, + RUR, + SAR, + SCR, + SEK, + SGD, + SKP, + THB, + TRL, + TTD, + TWD, + USD, + VEB, + VND, + XEU, + ZAR, + ZWD, + NOK, + } +} diff --git a/IfcMeasureResource/IfcDerivedUnitEnum.java b/IfcMeasureResource/IfcDerivedUnitEnum.java index 7d50468e..7df3ef8e 100644 --- a/IfcMeasureResource/IfcDerivedUnitEnum.java +++ b/IfcMeasureResource/IfcDerivedUnitEnum.java @@ -6,7 +6,6 @@ public enum IfcDerivedUnitEnum { ANGULARVELOCITYUNIT, - AREADENSITYUNIT, COMPOUNDPLANEANGLEUNIT, DYNAMICVISCOSITYUNIT, HEATFLUXDENSITYUNIT, @@ -48,12 +47,9 @@ public enum IfcDerivedUnitEnum ROTATIONALMASSUNIT, SECTIONAREAINTEGRALUNIT, SECTIONMODULUSUNIT, - SOUNDPOWERLEVELUNIT, SOUNDPOWERUNIT, - SOUNDPRESSURELEVELUNIT, SOUNDPRESSUREUNIT, TEMPERATUREGRADIENTUNIT, - TEMPERATURERATEOFCHANGEUNIT, THERMALEXPANSIONCOEFFICIENTUNIT, WARPINGCONSTANTUNIT, WARPINGMOMENTUNIT, diff --git a/IfcMeasureResource/IfcMonetaryUnit.java b/IfcMeasureResource/IfcMonetaryUnit.java index d9c65041..848a626a 100644 --- a/IfcMeasureResource/IfcMonetaryUnit.java +++ b/IfcMeasureResource/IfcMonetaryUnit.java @@ -5,6 +5,6 @@ { public class IfcMonetaryUnit extends IfcBase { - private string Currency; + private IfcCurrencyEnum Currency; } } diff --git a/IfcMeasureResource/IfcNonNegativeLengthMeasure.java b/IfcMeasureResource/IfcNonNegativeLengthMeasure.java deleted file mode 100644 index e8edbfb5..00000000 --- a/IfcMeasureResource/IfcNonNegativeLengthMeasure.java +++ /dev/null @@ -1,6 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ -} diff --git a/IfcMeasureResource/IfcPositiveInteger.java b/IfcMeasureResource/IfcPositiveInteger.java deleted file mode 100644 index e8edbfb5..00000000 --- a/IfcMeasureResource/IfcPositiveInteger.java +++ /dev/null @@ -1,6 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ -} diff --git a/IfcMeasureResource/IfcSoundPowerLevelMeasure.java b/IfcMeasureResource/IfcSoundPowerLevelMeasure.java deleted file mode 100644 index e8edbfb5..00000000 --- a/IfcMeasureResource/IfcSoundPowerLevelMeasure.java +++ /dev/null @@ -1,6 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ -} diff --git a/IfcMeasureResource/IfcSoundPressureLevelMeasure.java b/IfcMeasureResource/IfcSoundPressureLevelMeasure.java deleted file mode 100644 index e8edbfb5..00000000 --- a/IfcMeasureResource/IfcSoundPressureLevelMeasure.java +++ /dev/null @@ -1,6 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ -} diff --git a/IfcMeasureResource/IfcTemperatureRateOfChangeMeasure.java b/IfcMeasureResource/IfcTemperatureRateOfChangeMeasure.java deleted file mode 100644 index e8edbfb5..00000000 --- a/IfcMeasureResource/IfcTemperatureRateOfChangeMeasure.java +++ /dev/null @@ -1,6 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ -} diff --git a/IfcDateTimeResource/IfcTimeStamp.java b/IfcMeasureResource/IfcTimeStamp.java similarity index 100% rename from IfcDateTimeResource/IfcTimeStamp.java rename to IfcMeasureResource/IfcTimeStamp.java diff --git a/IfcPlumbingFireProtectionDomain/IfcFireSuppressionTerminal.java b/IfcPlumbingFireProtectionDomain/IfcFireSuppressionTerminal.java deleted file mode 100644 index 4e68b17f..00000000 --- a/IfcPlumbingFireProtectionDomain/IfcFireSuppressionTerminal.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcFireSuppressionTerminal extends IfcFlowTerminal - { - private IfcFireSuppressionTerminalTypeEnum PredefinedType; - } -} diff --git a/IfcPlumbingFireProtectionDomain/IfcInterceptor.java b/IfcPlumbingFireProtectionDomain/IfcInterceptor.java deleted file mode 100644 index a723df21..00000000 --- a/IfcPlumbingFireProtectionDomain/IfcInterceptor.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcInterceptor extends IfcFlowTreatmentDevice - { - private IfcInterceptorTypeEnum PredefinedType; - } -} diff --git a/IfcPlumbingFireProtectionDomain/IfcInterceptorType.java b/IfcPlumbingFireProtectionDomain/IfcInterceptorType.java deleted file mode 100644 index a6f737b8..00000000 --- a/IfcPlumbingFireProtectionDomain/IfcInterceptorType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcInterceptorType extends IfcFlowTreatmentDeviceType - { - private IfcInterceptorTypeEnum PredefinedType; - } -} diff --git a/IfcPlumbingFireProtectionDomain/IfcInterceptorTypeEnum.java b/IfcPlumbingFireProtectionDomain/IfcInterceptorTypeEnum.java deleted file mode 100644 index 04354a48..00000000 --- a/IfcPlumbingFireProtectionDomain/IfcInterceptorTypeEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcInterceptorTypeEnum - { - CYCLONIC, - GREASE, - OIL, - PETROL, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcPlumbingFireProtectionDomain/IfcSanitaryTerminal.java b/IfcPlumbingFireProtectionDomain/IfcSanitaryTerminal.java deleted file mode 100644 index 5ac5b5a0..00000000 --- a/IfcPlumbingFireProtectionDomain/IfcSanitaryTerminal.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSanitaryTerminal extends IfcFlowTerminal - { - private IfcSanitaryTerminalTypeEnum PredefinedType; - } -} diff --git a/IfcPlumbingFireProtectionDomain/IfcStackTerminal.java b/IfcPlumbingFireProtectionDomain/IfcStackTerminal.java deleted file mode 100644 index ea8f1afd..00000000 --- a/IfcPlumbingFireProtectionDomain/IfcStackTerminal.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcStackTerminal extends IfcFlowTerminal - { - private IfcStackTerminalTypeEnum PredefinedType; - } -} diff --git a/IfcPlumbingFireProtectionDomain/IfcWasteTerminal.java b/IfcPlumbingFireProtectionDomain/IfcWasteTerminal.java deleted file mode 100644 index a59e284d..00000000 --- a/IfcPlumbingFireProtectionDomain/IfcWasteTerminal.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcWasteTerminal extends IfcFlowTerminal - { - private IfcWasteTerminalTypeEnum PredefinedType; - } -} diff --git a/IfcPlumbingFireProtectionDomain/IfcWasteTerminalTypeEnum.java b/IfcPlumbingFireProtectionDomain/IfcWasteTerminalTypeEnum.java index 1b886793..32f59222 100644 --- a/IfcPlumbingFireProtectionDomain/IfcWasteTerminalTypeEnum.java +++ b/IfcPlumbingFireProtectionDomain/IfcWasteTerminalTypeEnum.java @@ -9,6 +9,9 @@ public enum IfcWasteTerminalTypeEnum FLOORWASTE, GULLYSUMP, GULLYTRAP, + GREASEINTERCEPTOR, + OILINTERCEPTOR, + PETROLINTERCEPTOR, ROOFDRAIN, WASTEDISPOSALUNIT, WASTETRAP, diff --git a/IfcPresentationAppearanceResource/IfcBlobTexture.java b/IfcPresentationAppearanceResource/IfcBlobTexture.java index 2c41f505..fdd40dc2 100644 --- a/IfcPresentationAppearanceResource/IfcBlobTexture.java +++ b/IfcPresentationAppearanceResource/IfcBlobTexture.java @@ -6,6 +6,6 @@ public class IfcBlobTexture extends IfcSurfaceTexture { private string RasterFormat; - private byte[] RasterCode; + private BOOLEAN RasterCode; } } diff --git a/IfcExternalReferenceResource/IfcResourceObjectSelect.java b/IfcPresentationAppearanceResource/IfcCharacterStyleSelect.java similarity index 82% rename from IfcExternalReferenceResource/IfcResourceObjectSelect.java rename to IfcPresentationAppearanceResource/IfcCharacterStyleSelect.java index 9319574b..55a0ad85 100644 --- a/IfcExternalReferenceResource/IfcResourceObjectSelect.java +++ b/IfcPresentationAppearanceResource/IfcCharacterStyleSelect.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public interface IfcResourceObjectSelect + public interface IfcCharacterStyleSelect { } } diff --git a/IfcPresentationAppearanceResource/IfcColourRgbList.java b/IfcPresentationAppearanceResource/IfcColourRgbList.java deleted file mode 100644 index ddd8610e..00000000 --- a/IfcPresentationAppearanceResource/IfcColourRgbList.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcColourRgbList extends IfcPresentationItem - { - private IfcRatioMeasure[] ColourList; - } -} diff --git a/IfcPresentationAppearanceResource/IfcCurveStyle.java b/IfcPresentationAppearanceResource/IfcCurveStyle.java index 9a445465..1ddb7505 100644 --- a/IfcPresentationAppearanceResource/IfcCurveStyle.java +++ b/IfcPresentationAppearanceResource/IfcCurveStyle.java @@ -8,6 +8,5 @@ public class IfcCurveStyle extends IfcPresentationStyle private IfcCurveFontOrScaledCurveFontSelect CurveFont; private IfcSizeSelect CurveWidth; private IfcColour CurveColour; - private bool ModelOrDraughting; } } diff --git a/IfcPresentationAppearanceResource/IfcCurveStyleFont.java b/IfcPresentationAppearanceResource/IfcCurveStyleFont.java index 69041a0f..697c4ce9 100644 --- a/IfcPresentationAppearanceResource/IfcCurveStyleFont.java +++ b/IfcPresentationAppearanceResource/IfcCurveStyleFont.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcCurveStyleFont extends IfcPresentationItem + public class IfcCurveStyleFont extends IfcBase { private string Name; private IfcCurveStyleFontPattern[] PatternList; diff --git a/IfcPresentationAppearanceResource/IfcCurveStyleFontAndScaling.java b/IfcPresentationAppearanceResource/IfcCurveStyleFontAndScaling.java index d9463fb5..412013d5 100644 --- a/IfcPresentationAppearanceResource/IfcCurveStyleFontAndScaling.java +++ b/IfcPresentationAppearanceResource/IfcCurveStyleFontAndScaling.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcCurveStyleFontAndScaling extends IfcPresentationItem + public class IfcCurveStyleFontAndScaling extends IfcBase { private string Name; private IfcCurveStyleFontSelect CurveFont; diff --git a/IfcPresentationAppearanceResource/IfcCurveStyleFontPattern.java b/IfcPresentationAppearanceResource/IfcCurveStyleFontPattern.java index 8719d3fb..3ee2fb81 100644 --- a/IfcPresentationAppearanceResource/IfcCurveStyleFontPattern.java +++ b/IfcPresentationAppearanceResource/IfcCurveStyleFontPattern.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcCurveStyleFontPattern extends IfcPresentationItem + public class IfcCurveStyleFontPattern extends IfcBase { private double VisibleSegmentLength; private IfcLengthMeasure InvisibleSegmentLength; diff --git a/IfcPresentationAppearanceResource/IfcFillAreaStyle.java b/IfcPresentationAppearanceResource/IfcFillAreaStyle.java index 2ef50a7e..1c4e5c89 100644 --- a/IfcPresentationAppearanceResource/IfcFillAreaStyle.java +++ b/IfcPresentationAppearanceResource/IfcFillAreaStyle.java @@ -6,6 +6,5 @@ public class IfcFillAreaStyle extends IfcPresentationStyle { private IfcFillStyleSelect[] FillStyles; - private bool ModelorDraughting; } } diff --git a/IfcPresentationAppearanceResource/IfcFillAreaStyleTileShapeSelect.java b/IfcPresentationAppearanceResource/IfcFillAreaStyleTileShapeSelect.java new file mode 100644 index 00000000..a0fe722a --- /dev/null +++ b/IfcPresentationAppearanceResource/IfcFillAreaStyleTileShapeSelect.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public interface IfcFillAreaStyleTileShapeSelect + { + } +} diff --git a/IfcPresentationAppearanceResource/IfcFillAreaStyleTileSymbolWithStyle.java b/IfcPresentationAppearanceResource/IfcFillAreaStyleTileSymbolWithStyle.java new file mode 100644 index 00000000..943cd240 --- /dev/null +++ b/IfcPresentationAppearanceResource/IfcFillAreaStyleTileSymbolWithStyle.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcFillAreaStyleTileSymbolWithStyle extends IfcGeometricRepresentationItem + { + private IfcAnnotationSymbolOccurrence Symbol; + } +} diff --git a/IfcPresentationAppearanceResource/IfcFillAreaStyleTiles.java b/IfcPresentationAppearanceResource/IfcFillAreaStyleTiles.java index b7ecaf9e..6829543c 100644 --- a/IfcPresentationAppearanceResource/IfcFillAreaStyleTiles.java +++ b/IfcPresentationAppearanceResource/IfcFillAreaStyleTiles.java @@ -5,8 +5,8 @@ { public class IfcFillAreaStyleTiles extends IfcGeometricRepresentationItem { - private IfcVector[] TilingPattern; - private IfcStyledItem[] Tiles; + private IfcOneDirectionRepeatFactor TilingPattern; + private IfcFillAreaStyleTileShapeSelect[] Tiles; private IfcRatioMeasure TilingScale; } } diff --git a/IfcPresentationAppearanceResource/IfcImageTexture.java b/IfcPresentationAppearanceResource/IfcImageTexture.java index d5f370e7..3bdf0e85 100644 --- a/IfcPresentationAppearanceResource/IfcImageTexture.java +++ b/IfcPresentationAppearanceResource/IfcImageTexture.java @@ -5,6 +5,6 @@ { public class IfcImageTexture extends IfcSurfaceTexture { - private string URLReference; + private string UrlReference; } } diff --git a/IfcPresentationAppearanceResource/IfcIndexedColourMap.java b/IfcPresentationAppearanceResource/IfcIndexedColourMap.java deleted file mode 100644 index e941e6ee..00000000 --- a/IfcPresentationAppearanceResource/IfcIndexedColourMap.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcIndexedColourMap extends IfcPresentationItem - { - private IfcTessellatedFaceSet MappedTo; - private IfcRatioMeasure Opacity; - private IfcColourRgbList Colours; - private IfcInteger[] ColourIndex; - } -} diff --git a/IfcPresentationAppearanceResource/IfcIndexedTextureMap.java b/IfcPresentationAppearanceResource/IfcIndexedTextureMap.java deleted file mode 100644 index ab08dc63..00000000 --- a/IfcPresentationAppearanceResource/IfcIndexedTextureMap.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcIndexedTextureMap extends IfcTextureCoordinate - { - private IfcTessellatedFaceSet MappedTo; - private IfcTextureVertexList TexCoords; - } -} diff --git a/IfcPresentationAppearanceResource/IfcIndexedTriangleTextureMap.java b/IfcPresentationAppearanceResource/IfcIndexedTriangleTextureMap.java deleted file mode 100644 index 75548cd7..00000000 --- a/IfcPresentationAppearanceResource/IfcIndexedTriangleTextureMap.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcIndexedTriangleTextureMap extends IfcIndexedTextureMap - { - private IfcInteger[] TexCoordIndex; - } -} diff --git a/IfcPresentationAppearanceResource/IfcOneDirectionRepeatFactor.java b/IfcPresentationAppearanceResource/IfcOneDirectionRepeatFactor.java new file mode 100644 index 00000000..0415ffc3 --- /dev/null +++ b/IfcPresentationAppearanceResource/IfcOneDirectionRepeatFactor.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcOneDirectionRepeatFactor extends IfcGeometricRepresentationItem + { + private IfcVector RepeatFactor; + } +} diff --git a/IfcPresentationAppearanceResource/IfcPixelTexture.java b/IfcPresentationAppearanceResource/IfcPixelTexture.java index 453af1c8..09a7138a 100644 --- a/IfcPresentationAppearanceResource/IfcPixelTexture.java +++ b/IfcPresentationAppearanceResource/IfcPixelTexture.java @@ -8,6 +8,6 @@ public class IfcPixelTexture extends IfcSurfaceTexture private int Width; private int Height; private int ColourComponents; - private byte[][] Pixel; + private BINARY (32)[] Pixel; } } diff --git a/IfcPresentationAppearanceResource/IfcStyleAssignmentSelect.java b/IfcPresentationAppearanceResource/IfcStyleAssignmentSelect.java deleted file mode 100644 index dbc07a6a..00000000 --- a/IfcPresentationAppearanceResource/IfcStyleAssignmentSelect.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public interface IfcStyleAssignmentSelect - { - } -} diff --git a/IfcPresentationAppearanceResource/IfcStyledItem.java b/IfcPresentationAppearanceResource/IfcStyledItem.java index 1b4829a0..f9ee9663 100644 --- a/IfcPresentationAppearanceResource/IfcStyledItem.java +++ b/IfcPresentationAppearanceResource/IfcStyledItem.java @@ -6,7 +6,7 @@ public class IfcStyledItem extends IfcRepresentationItem { private IfcRepresentationItem Item; - private IfcStyleAssignmentSelect[] Styles; + private IfcPresentationStyleAssignment[] Styles; private string Name; } } diff --git a/IfcPresentationAppearanceResource/IfcSurfaceStyleLighting.java b/IfcPresentationAppearanceResource/IfcSurfaceStyleLighting.java index ee6cf0fc..ebf335b3 100644 --- a/IfcPresentationAppearanceResource/IfcSurfaceStyleLighting.java +++ b/IfcPresentationAppearanceResource/IfcSurfaceStyleLighting.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcSurfaceStyleLighting extends IfcPresentationItem + public class IfcSurfaceStyleLighting extends IfcBase { private IfcColourRgb DiffuseTransmissionColour; private IfcColourRgb DiffuseReflectionColour; diff --git a/IfcPresentationAppearanceResource/IfcSurfaceStyleRefraction.java b/IfcPresentationAppearanceResource/IfcSurfaceStyleRefraction.java index 7cca24ff..9edd0ab1 100644 --- a/IfcPresentationAppearanceResource/IfcSurfaceStyleRefraction.java +++ b/IfcPresentationAppearanceResource/IfcSurfaceStyleRefraction.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcSurfaceStyleRefraction extends IfcPresentationItem + public class IfcSurfaceStyleRefraction extends IfcBase { private double RefractionIndex; private double DispersionFactor; diff --git a/IfcPresentationAppearanceResource/IfcSurfaceStyleRendering.java b/IfcPresentationAppearanceResource/IfcSurfaceStyleRendering.java index 918959ca..b52fbda3 100644 --- a/IfcPresentationAppearanceResource/IfcSurfaceStyleRendering.java +++ b/IfcPresentationAppearanceResource/IfcSurfaceStyleRendering.java @@ -5,6 +5,7 @@ { public class IfcSurfaceStyleRendering extends IfcSurfaceStyleShading { + private IfcRatioMeasure Transparency; private IfcColourOrFactor DiffuseColour; private IfcColourOrFactor TransmissionColour; private IfcColourOrFactor DiffuseTransmissionColour; diff --git a/IfcPresentationAppearanceResource/IfcSurfaceStyleShading.java b/IfcPresentationAppearanceResource/IfcSurfaceStyleShading.java index 2ca9d94c..f826208a 100644 --- a/IfcPresentationAppearanceResource/IfcSurfaceStyleShading.java +++ b/IfcPresentationAppearanceResource/IfcSurfaceStyleShading.java @@ -3,9 +3,8 @@ package buildingsmart.ifc { - public class IfcSurfaceStyleShading extends IfcPresentationItem + public class IfcSurfaceStyleShading extends IfcBase { private IfcColourRgb SurfaceColour; - private IfcRatioMeasure Transparency; } } diff --git a/IfcPresentationAppearanceResource/IfcSurfaceStyleWithTextures.java b/IfcPresentationAppearanceResource/IfcSurfaceStyleWithTextures.java index 33b0df4e..b7e23c9a 100644 --- a/IfcPresentationAppearanceResource/IfcSurfaceStyleWithTextures.java +++ b/IfcPresentationAppearanceResource/IfcSurfaceStyleWithTextures.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcSurfaceStyleWithTextures extends IfcPresentationItem + public class IfcSurfaceStyleWithTextures extends IfcBase { private IfcSurfaceTexture[] Textures; } diff --git a/IfcPresentationAppearanceResource/IfcSurfaceTexture.java b/IfcPresentationAppearanceResource/IfcSurfaceTexture.java index 450eafab..d280ae49 100644 --- a/IfcPresentationAppearanceResource/IfcSurfaceTexture.java +++ b/IfcPresentationAppearanceResource/IfcSurfaceTexture.java @@ -3,14 +3,11 @@ package buildingsmart.ifc { - public class IfcSurfaceTexture extends IfcPresentationItem + public class IfcSurfaceTexture extends IfcBase { - private bool RepeatS; - private bool RepeatT; - private string Mode; + private BOOLEAN RepeatS; + private BOOLEAN RepeatT; + private IfcSurfaceTextureEnum TextureType; private IfcCartesianTransformationOperator2D TextureTransform; - private string[] Parameter; - private IfcTextureCoordinate[] IsMappedBy; - private IfcSurfaceStyleWithTextures[] UsedInStyles; } } diff --git a/IfcPresentationAppearanceResource/IfcSurfaceTextureEnum.java b/IfcPresentationAppearanceResource/IfcSurfaceTextureEnum.java new file mode 100644 index 00000000..68b1d549 --- /dev/null +++ b/IfcPresentationAppearanceResource/IfcSurfaceTextureEnum.java @@ -0,0 +1,18 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public enum IfcSurfaceTextureEnum + { + BUMP, + OPACITY, + REFLECTION, + SELFILLUMINATION, + SHININESS, + SPECULAR, + TEXTURE, + TRANSPARENCYMAP, + NOTDEFINED, + } +} diff --git a/IfcBuildingControlsDomain/IfcAlarm.java b/IfcPresentationAppearanceResource/IfcSymbolStyle.java similarity index 65% rename from IfcBuildingControlsDomain/IfcAlarm.java rename to IfcPresentationAppearanceResource/IfcSymbolStyle.java index b7987d08..38cc0199 100644 --- a/IfcBuildingControlsDomain/IfcAlarm.java +++ b/IfcPresentationAppearanceResource/IfcSymbolStyle.java @@ -3,8 +3,8 @@ package buildingsmart.ifc { - public class IfcAlarm extends IfcDistributionControlElement + public class IfcSymbolStyle extends IfcPresentationStyle { - private IfcAlarmTypeEnum PredefinedType; + private IfcSymbolStyleSelect StyleOfSymbol; } } diff --git a/IfcDateTimeResource/IfcTimeOrRatioSelect.java b/IfcPresentationAppearanceResource/IfcSymbolStyleSelect.java similarity index 83% rename from IfcDateTimeResource/IfcTimeOrRatioSelect.java rename to IfcPresentationAppearanceResource/IfcSymbolStyleSelect.java index 21683c6d..06e5626b 100644 --- a/IfcDateTimeResource/IfcTimeOrRatioSelect.java +++ b/IfcPresentationAppearanceResource/IfcSymbolStyleSelect.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public interface IfcTimeOrRatioSelect + public interface IfcSymbolStyleSelect { } } diff --git a/IfcPresentationAppearanceResource/IfcTextStyle.java b/IfcPresentationAppearanceResource/IfcTextStyle.java index 510ea40e..20629a1b 100644 --- a/IfcPresentationAppearanceResource/IfcTextStyle.java +++ b/IfcPresentationAppearanceResource/IfcTextStyle.java @@ -5,9 +5,8 @@ { public class IfcTextStyle extends IfcPresentationStyle { - private IfcTextStyleForDefinedFont TextCharacterAppearance; - private IfcTextStyleTextModel TextStyle; + private IfcCharacterStyleSelect TextCharacterAppearance; + private IfcTextStyleSelect TextStyle; private IfcTextFontSelect TextFontStyle; - private bool ModelOrDraughting; } } diff --git a/IfcPresentationAppearanceResource/IfcTextStyleForDefinedFont.java b/IfcPresentationAppearanceResource/IfcTextStyleForDefinedFont.java index ba605396..029dedb2 100644 --- a/IfcPresentationAppearanceResource/IfcTextStyleForDefinedFont.java +++ b/IfcPresentationAppearanceResource/IfcTextStyleForDefinedFont.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcTextStyleForDefinedFont extends IfcPresentationItem + public class IfcTextStyleForDefinedFont extends IfcBase { private IfcColour Colour; private IfcColour BackgroundColour; diff --git a/IfcGeometryResource/IfcCurveOnSurface.java b/IfcPresentationAppearanceResource/IfcTextStyleSelect.java similarity index 84% rename from IfcGeometryResource/IfcCurveOnSurface.java rename to IfcPresentationAppearanceResource/IfcTextStyleSelect.java index 05df348e..af19eaa2 100644 --- a/IfcGeometryResource/IfcCurveOnSurface.java +++ b/IfcPresentationAppearanceResource/IfcTextStyleSelect.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public interface IfcCurveOnSurface + public interface IfcTextStyleSelect { } } diff --git a/IfcPresentationAppearanceResource/IfcTextStyleTextModel.java b/IfcPresentationAppearanceResource/IfcTextStyleTextModel.java index 86c03ed9..2405421d 100644 --- a/IfcPresentationAppearanceResource/IfcTextStyleTextModel.java +++ b/IfcPresentationAppearanceResource/IfcTextStyleTextModel.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcTextStyleTextModel extends IfcPresentationItem + public class IfcTextStyleTextModel extends IfcBase { private IfcSizeSelect TextIndent; private string TextAlign; diff --git a/IfcPresentationAppearanceResource/IfcTextStyleWithBoxCharacteristics.java b/IfcPresentationAppearanceResource/IfcTextStyleWithBoxCharacteristics.java new file mode 100644 index 00000000..adb4a4c3 --- /dev/null +++ b/IfcPresentationAppearanceResource/IfcTextStyleWithBoxCharacteristics.java @@ -0,0 +1,14 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcTextStyleWithBoxCharacteristics extends IfcBase + { + private IfcLengthMeasure BoxHeight; + private IfcLengthMeasure BoxWidth; + private double BoxSlantAngle; + private double BoxRotateAngle; + private IfcSizeSelect CharacterSpacing; + } +} diff --git a/IfcPresentationAppearanceResource/IfcTextureVertexList.java b/IfcPresentationAppearanceResource/IfcTextureVertexList.java deleted file mode 100644 index 01c49616..00000000 --- a/IfcPresentationAppearanceResource/IfcTextureVertexList.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcTextureVertexList extends IfcPresentationItem - { - private double[] TexCoordsList; - } -} diff --git a/IfcPresentationAppearanceResource/IfcTwoDirectionRepeatFactor.java b/IfcPresentationAppearanceResource/IfcTwoDirectionRepeatFactor.java new file mode 100644 index 00000000..40bedfbb --- /dev/null +++ b/IfcPresentationAppearanceResource/IfcTwoDirectionRepeatFactor.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcTwoDirectionRepeatFactor extends IfcOneDirectionRepeatFactor + { + private IfcVector SecondRepeatFactor; + } +} diff --git a/IfcPresentationDefinitionResource/IfcAnnotationCurveOccurrence.java b/IfcPresentationDefinitionResource/IfcAnnotationCurveOccurrence.java new file mode 100644 index 00000000..4fc97242 --- /dev/null +++ b/IfcPresentationDefinitionResource/IfcAnnotationCurveOccurrence.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcAnnotationCurveOccurrence extends IfcAnnotationOccurrence + { + } +} diff --git a/IfcPresentationDefinitionResource/IfcAnnotationFillAreaOccurrence.java b/IfcPresentationDefinitionResource/IfcAnnotationFillAreaOccurrence.java new file mode 100644 index 00000000..1f17f5f4 --- /dev/null +++ b/IfcPresentationDefinitionResource/IfcAnnotationFillAreaOccurrence.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcAnnotationFillAreaOccurrence extends IfcAnnotationOccurrence + { + private IfcPoint FillStyleTarget; + private IfcGlobalOrLocalEnum GlobalOrLocal; + } +} diff --git a/IfcPresentationDefinitionResource/IfcAnnotationOccurrence.java b/IfcPresentationDefinitionResource/IfcAnnotationOccurrence.java new file mode 100644 index 00000000..46b5f1e3 --- /dev/null +++ b/IfcPresentationDefinitionResource/IfcAnnotationOccurrence.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcAnnotationOccurrence extends IfcStyledItem + { + } +} diff --git a/IfcPresentationDefinitionResource/IfcAnnotationSurface.java b/IfcPresentationDefinitionResource/IfcAnnotationSurface.java new file mode 100644 index 00000000..514707cf --- /dev/null +++ b/IfcPresentationDefinitionResource/IfcAnnotationSurface.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcAnnotationSurface extends IfcGeometricRepresentationItem + { + private IfcGeometricRepresentationItem Item; + private IfcTextureCoordinate TextureCoordinates; + } +} diff --git a/IfcPresentationDefinitionResource/IfcAnnotationSurfaceOccurrence.java b/IfcPresentationDefinitionResource/IfcAnnotationSurfaceOccurrence.java new file mode 100644 index 00000000..3e756773 --- /dev/null +++ b/IfcPresentationDefinitionResource/IfcAnnotationSurfaceOccurrence.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcAnnotationSurfaceOccurrence extends IfcAnnotationOccurrence + { + } +} diff --git a/IfcPresentationDefinitionResource/IfcAnnotationSymbolOccurrence.java b/IfcPresentationDefinitionResource/IfcAnnotationSymbolOccurrence.java new file mode 100644 index 00000000..80c211b2 --- /dev/null +++ b/IfcPresentationDefinitionResource/IfcAnnotationSymbolOccurrence.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcAnnotationSymbolOccurrence extends IfcAnnotationOccurrence + { + } +} diff --git a/IfcPresentationDefinitionResource/IfcAnnotationTextOccurrence.java b/IfcPresentationDefinitionResource/IfcAnnotationTextOccurrence.java new file mode 100644 index 00000000..4f19d880 --- /dev/null +++ b/IfcPresentationDefinitionResource/IfcAnnotationTextOccurrence.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcAnnotationTextOccurrence extends IfcAnnotationOccurrence + { + } +} diff --git a/IfcPresentationDefinitionResource/IfcDefinedSymbol.java b/IfcPresentationDefinitionResource/IfcDefinedSymbol.java new file mode 100644 index 00000000..3c17324f --- /dev/null +++ b/IfcPresentationDefinitionResource/IfcDefinedSymbol.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcDefinedSymbol extends IfcGeometricRepresentationItem + { + private IfcDefinedSymbolSelect Definition; + private IfcCartesianTransformationOperator2D Target; + } +} diff --git a/IfcGeometryResource/IfcSegmentIndexSelect.java b/IfcPresentationDefinitionResource/IfcDefinedSymbolSelect.java similarity index 82% rename from IfcGeometryResource/IfcSegmentIndexSelect.java rename to IfcPresentationDefinitionResource/IfcDefinedSymbolSelect.java index 9ec4aaf0..d8285325 100644 --- a/IfcGeometryResource/IfcSegmentIndexSelect.java +++ b/IfcPresentationDefinitionResource/IfcDefinedSymbolSelect.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public interface IfcSegmentIndexSelect + public interface IfcDefinedSymbolSelect { } } diff --git a/IfcPresentationDefinitionResource/IfcExternallyDefinedSymbol.java b/IfcPresentationDefinitionResource/IfcExternallyDefinedSymbol.java new file mode 100644 index 00000000..a77f0106 --- /dev/null +++ b/IfcPresentationDefinitionResource/IfcExternallyDefinedSymbol.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcExternallyDefinedSymbol extends IfcExternalReference + { + } +} diff --git a/IfcPresentationDefinitionResource/IfcPreDefinedSymbol.java b/IfcPresentationDefinitionResource/IfcPreDefinedSymbol.java new file mode 100644 index 00000000..746bc772 --- /dev/null +++ b/IfcPresentationDefinitionResource/IfcPreDefinedSymbol.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcPreDefinedSymbol extends IfcPreDefinedItem + { + } +} diff --git a/IfcPresentationDefinitionResource/IfcPresentationItem.java b/IfcPresentationDefinitionResource/IfcPresentationItem.java deleted file mode 100644 index e2f95b9f..00000000 --- a/IfcPresentationDefinitionResource/IfcPresentationItem.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcPresentationItem extends IfcBase - { - } -} diff --git a/IfcPresentationAppearanceResource/IfcTextureCoordinate.java b/IfcPresentationDefinitionResource/IfcTextureCoordinate.java similarity index 65% rename from IfcPresentationAppearanceResource/IfcTextureCoordinate.java rename to IfcPresentationDefinitionResource/IfcTextureCoordinate.java index 7121803a..f3464dbe 100644 --- a/IfcPresentationAppearanceResource/IfcTextureCoordinate.java +++ b/IfcPresentationDefinitionResource/IfcTextureCoordinate.java @@ -3,8 +3,8 @@ package buildingsmart.ifc { - public class IfcTextureCoordinate extends IfcPresentationItem + public class IfcTextureCoordinate extends IfcBase { - private IfcSurfaceTexture[] Maps; + private IfcAnnotationSurface[] AnnotatedSurface; } } diff --git a/IfcPresentationAppearanceResource/IfcTextureCoordinateGenerator.java b/IfcPresentationDefinitionResource/IfcTextureCoordinateGenerator.java similarity index 88% rename from IfcPresentationAppearanceResource/IfcTextureCoordinateGenerator.java rename to IfcPresentationDefinitionResource/IfcTextureCoordinateGenerator.java index 4a4d406b..8f829e1e 100644 --- a/IfcPresentationAppearanceResource/IfcTextureCoordinateGenerator.java +++ b/IfcPresentationDefinitionResource/IfcTextureCoordinateGenerator.java @@ -6,6 +6,6 @@ public class IfcTextureCoordinateGenerator extends IfcTextureCoordinate { private string Mode; - private double[] Parameter; + private IfcSimpleValue[] Parameter; } } diff --git a/IfcPresentationAppearanceResource/IfcTextureMap.java b/IfcPresentationDefinitionResource/IfcTextureMap.java similarity index 79% rename from IfcPresentationAppearanceResource/IfcTextureMap.java rename to IfcPresentationDefinitionResource/IfcTextureMap.java index 89467df3..4d437c75 100644 --- a/IfcPresentationAppearanceResource/IfcTextureMap.java +++ b/IfcPresentationDefinitionResource/IfcTextureMap.java @@ -5,7 +5,6 @@ { public class IfcTextureMap extends IfcTextureCoordinate { - private IfcTextureVertex[] Vertices; - private IfcFace MappedTo; + private IfcVertexBasedTextureMap[] TextureMaps; } } diff --git a/IfcPresentationAppearanceResource/IfcTextureVertex.java b/IfcPresentationDefinitionResource/IfcTextureVertex.java similarity index 79% rename from IfcPresentationAppearanceResource/IfcTextureVertex.java rename to IfcPresentationDefinitionResource/IfcTextureVertex.java index 523067da..0adc6d46 100644 --- a/IfcPresentationAppearanceResource/IfcTextureVertex.java +++ b/IfcPresentationDefinitionResource/IfcTextureVertex.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcTextureVertex extends IfcPresentationItem + public class IfcTextureVertex extends IfcBase { private double[] Coordinates; } diff --git a/IfcPresentationDefinitionResource/IfcVertexBasedTextureMap.java b/IfcPresentationDefinitionResource/IfcVertexBasedTextureMap.java new file mode 100644 index 00000000..17da2570 --- /dev/null +++ b/IfcPresentationDefinitionResource/IfcVertexBasedTextureMap.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcVertexBasedTextureMap extends IfcBase + { + private IfcTextureVertex[] TextureVertices; + private IfcCartesianPoint[] TexturePoints; + } +} diff --git a/IfcPresentationOrganizationResource/IfcPresentationLayerWithStyle.java b/IfcPresentationOrganizationResource/IfcPresentationLayerWithStyle.java index 28798573..df5bf266 100644 --- a/IfcPresentationOrganizationResource/IfcPresentationLayerWithStyle.java +++ b/IfcPresentationOrganizationResource/IfcPresentationLayerWithStyle.java @@ -5,9 +5,9 @@ { public class IfcPresentationLayerWithStyle extends IfcPresentationLayerAssignment { - private int LayerOn; - private int LayerFrozen; - private int LayerBlocked; - private IfcPresentationStyle[] LayerStyles; + private LOGICAL LayerOn; + private LOGICAL LayerFrozen; + private LOGICAL LayerBlocked; + private IfcPresentationStyleSelect[] LayerStyles; } } diff --git a/IfcPresentationAppearanceResource/IfcColour.java b/IfcPresentationResource/IfcColour.java similarity index 100% rename from IfcPresentationAppearanceResource/IfcColour.java rename to IfcPresentationResource/IfcColour.java diff --git a/IfcPresentationAppearanceResource/IfcColourRgb.java b/IfcPresentationResource/IfcColourRgb.java similarity index 100% rename from IfcPresentationAppearanceResource/IfcColourRgb.java rename to IfcPresentationResource/IfcColourRgb.java diff --git a/IfcPresentationAppearanceResource/IfcColourSpecification.java b/IfcPresentationResource/IfcColourSpecification.java similarity index 77% rename from IfcPresentationAppearanceResource/IfcColourSpecification.java rename to IfcPresentationResource/IfcColourSpecification.java index 81f653d9..1bcebf92 100644 --- a/IfcPresentationAppearanceResource/IfcColourSpecification.java +++ b/IfcPresentationResource/IfcColourSpecification.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcColourSpecification extends IfcPresentationItem + public class IfcColourSpecification extends IfcBase { private string Name; } diff --git a/IfcPresentationAppearanceResource/IfcDraughtingPreDefinedColour.java b/IfcPresentationResource/IfcDraughtingPreDefinedColour.java similarity index 100% rename from IfcPresentationAppearanceResource/IfcDraughtingPreDefinedColour.java rename to IfcPresentationResource/IfcDraughtingPreDefinedColour.java diff --git a/IfcPresentationResource/IfcDraughtingPreDefinedTextFont.java b/IfcPresentationResource/IfcDraughtingPreDefinedTextFont.java new file mode 100644 index 00000000..b6540726 --- /dev/null +++ b/IfcPresentationResource/IfcDraughtingPreDefinedTextFont.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcDraughtingPreDefinedTextFont extends IfcPreDefinedTextFont + { + } +} diff --git a/IfcPresentationAppearanceResource/IfcExternallyDefinedTextFont.java b/IfcPresentationResource/IfcExternallyDefinedTextFont.java similarity index 100% rename from IfcPresentationAppearanceResource/IfcExternallyDefinedTextFont.java rename to IfcPresentationResource/IfcExternallyDefinedTextFont.java diff --git a/IfcPresentationAppearanceResource/IfcFontStyle.java b/IfcPresentationResource/IfcFontStyle.java similarity index 100% rename from IfcPresentationAppearanceResource/IfcFontStyle.java rename to IfcPresentationResource/IfcFontStyle.java diff --git a/IfcPresentationAppearanceResource/IfcFontVariant.java b/IfcPresentationResource/IfcFontVariant.java similarity index 100% rename from IfcPresentationAppearanceResource/IfcFontVariant.java rename to IfcPresentationResource/IfcFontVariant.java diff --git a/IfcPresentationAppearanceResource/IfcFontWeight.java b/IfcPresentationResource/IfcFontWeight.java similarity index 100% rename from IfcPresentationAppearanceResource/IfcFontWeight.java rename to IfcPresentationResource/IfcFontWeight.java diff --git a/IfcPresentationDefinitionResource/IfcPlanarBox.java b/IfcPresentationResource/IfcPlanarBox.java similarity index 100% rename from IfcPresentationDefinitionResource/IfcPlanarBox.java rename to IfcPresentationResource/IfcPlanarBox.java diff --git a/IfcPresentationDefinitionResource/IfcPlanarExtent.java b/IfcPresentationResource/IfcPlanarExtent.java similarity index 100% rename from IfcPresentationDefinitionResource/IfcPlanarExtent.java rename to IfcPresentationResource/IfcPlanarExtent.java diff --git a/IfcPresentationAppearanceResource/IfcPreDefinedColour.java b/IfcPresentationResource/IfcPreDefinedColour.java similarity index 100% rename from IfcPresentationAppearanceResource/IfcPreDefinedColour.java rename to IfcPresentationResource/IfcPreDefinedColour.java diff --git a/IfcPresentationAppearanceResource/IfcPreDefinedItem.java b/IfcPresentationResource/IfcPreDefinedItem.java similarity index 78% rename from IfcPresentationAppearanceResource/IfcPreDefinedItem.java rename to IfcPresentationResource/IfcPreDefinedItem.java index e897008c..c939e0eb 100644 --- a/IfcPresentationAppearanceResource/IfcPreDefinedItem.java +++ b/IfcPresentationResource/IfcPreDefinedItem.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcPreDefinedItem extends IfcPresentationItem + public class IfcPreDefinedItem extends IfcBase { private string Name; } diff --git a/IfcPresentationAppearanceResource/IfcPreDefinedTextFont.java b/IfcPresentationResource/IfcPreDefinedTextFont.java similarity index 100% rename from IfcPresentationAppearanceResource/IfcPreDefinedTextFont.java rename to IfcPresentationResource/IfcPreDefinedTextFont.java diff --git a/IfcPresentationAppearanceResource/IfcPresentableText.java b/IfcPresentationResource/IfcPresentableText.java similarity index 100% rename from IfcPresentationAppearanceResource/IfcPresentableText.java rename to IfcPresentationResource/IfcPresentableText.java diff --git a/IfcPresentationAppearanceResource/IfcTextFontName.java b/IfcPresentationResource/IfcTextFontName.java similarity index 100% rename from IfcPresentationAppearanceResource/IfcTextFontName.java rename to IfcPresentationResource/IfcTextFontName.java diff --git a/IfcPresentationAppearanceResource/IfcTextFontSelect.java b/IfcPresentationResource/IfcTextFontSelect.java similarity index 100% rename from IfcPresentationAppearanceResource/IfcTextFontSelect.java rename to IfcPresentationResource/IfcTextFontSelect.java diff --git a/IfcPresentationAppearanceResource/IfcTextStyleFontModel.java b/IfcPresentationResource/IfcTextStyleFontModel.java similarity index 100% rename from IfcPresentationAppearanceResource/IfcTextStyleFontModel.java rename to IfcPresentationResource/IfcTextStyleFontModel.java diff --git a/IfcProcessExtension/IfcEvent.java b/IfcProcessExtension/IfcEvent.java deleted file mode 100644 index a9169eae..00000000 --- a/IfcProcessExtension/IfcEvent.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcEvent extends IfcProcess - { - private IfcEventTypeEnum PredefinedType; - private IfcEventTriggerTypeEnum EventTriggerType; - private string UserDefinedEventTriggerType; - private IfcEventTime EventOccurenceTime; - } -} diff --git a/IfcProcessExtension/IfcEventTriggerTypeEnum.java b/IfcProcessExtension/IfcEventTriggerTypeEnum.java deleted file mode 100644 index ba950b42..00000000 --- a/IfcProcessExtension/IfcEventTriggerTypeEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcEventTriggerTypeEnum - { - EVENTRULE, - EVENTMESSAGE, - EVENTTIME, - EVENTCOMPLEX, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcProcessExtension/IfcEventType.java b/IfcProcessExtension/IfcEventType.java deleted file mode 100644 index 5f5cdbff..00000000 --- a/IfcProcessExtension/IfcEventType.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcEventType extends IfcTypeProcess - { - private IfcEventTypeEnum PredefinedType; - private IfcEventTriggerTypeEnum EventTriggerType; - private string UserDefinedEventTriggerType; - } -} diff --git a/IfcProcessExtension/IfcEventTypeEnum.java b/IfcProcessExtension/IfcEventTypeEnum.java deleted file mode 100644 index a5e83706..00000000 --- a/IfcProcessExtension/IfcEventTypeEnum.java +++ /dev/null @@ -1,14 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcEventTypeEnum - { - STARTEVENT, - ENDEVENT, - INTERMEDIATEEVENT, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcProcessExtension/IfcProcedure.java b/IfcProcessExtension/IfcProcedure.java index cef17f73..c1dcb47c 100644 --- a/IfcProcessExtension/IfcProcedure.java +++ b/IfcProcessExtension/IfcProcedure.java @@ -5,6 +5,8 @@ { public class IfcProcedure extends IfcProcess { - private IfcProcedureTypeEnum PredefinedType; + private string ProcedureID; + private IfcProcedureTypeEnum ProcedureType; + private string UserDefinedProcedureType; } } diff --git a/IfcProcessExtension/IfcProcedureType.java b/IfcProcessExtension/IfcProcedureType.java deleted file mode 100644 index 847c6461..00000000 --- a/IfcProcessExtension/IfcProcedureType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcProcedureType extends IfcTypeProcess - { - private IfcProcedureTypeEnum PredefinedType; - } -} diff --git a/IfcProcessExtension/IfcRelAssignsTasks.java b/IfcProcessExtension/IfcRelAssignsTasks.java new file mode 100644 index 00000000..dafc0759 --- /dev/null +++ b/IfcProcessExtension/IfcRelAssignsTasks.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcRelAssignsTasks extends IfcRelAssignsToControl + { + private IfcScheduleTimeControl TimeForTask; + } +} diff --git a/IfcProcessExtension/IfcScheduleTimeControl.java b/IfcProcessExtension/IfcScheduleTimeControl.java new file mode 100644 index 00000000..4d2364ba --- /dev/null +++ b/IfcProcessExtension/IfcScheduleTimeControl.java @@ -0,0 +1,28 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcScheduleTimeControl extends IfcControl + { + private IfcDateTimeSelect ActualStart; + private IfcDateTimeSelect EarlyStart; + private IfcDateTimeSelect LateStart; + private IfcDateTimeSelect ScheduleStart; + private IfcDateTimeSelect ActualFinish; + private IfcDateTimeSelect EarlyFinish; + private IfcDateTimeSelect LateFinish; + private IfcDateTimeSelect ScheduleFinish; + private double ScheduleDuration; + private double ActualDuration; + private double RemainingTime; + private double FreeFloat; + private double TotalFloat; + private BOOLEAN IsCritical; + private IfcDateTimeSelect StatusTime; + private double StartFloat; + private double FinishFloat; + private IfcRatioMeasure Completion; + private IfcRelAssignsTasks ScheduleTimeControlAssigned; + } +} diff --git a/IfcProcessExtension/IfcTask.java b/IfcProcessExtension/IfcTask.java index c5f2b271..9a786062 100644 --- a/IfcProcessExtension/IfcTask.java +++ b/IfcProcessExtension/IfcTask.java @@ -5,11 +5,10 @@ { public class IfcTask extends IfcProcess { + private string TaskId; private string Status; private string WorkMethod; - private bool IsMilestone; - private int Priority; - private IfcTaskTime TaskTime; - private IfcTaskTypeEnum PredefinedType; + private BOOLEAN IsMilestone; + private INTEGER Priority; } } diff --git a/IfcProcessExtension/IfcTaskType.java b/IfcProcessExtension/IfcTaskType.java deleted file mode 100644 index 2d5c4105..00000000 --- a/IfcProcessExtension/IfcTaskType.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcTaskType extends IfcTypeProcess - { - private IfcTaskTypeEnum PredefinedType; - private string WorkMethod; - } -} diff --git a/IfcProcessExtension/IfcTaskTypeEnum.java b/IfcProcessExtension/IfcTaskTypeEnum.java deleted file mode 100644 index fe50cc2b..00000000 --- a/IfcProcessExtension/IfcTaskTypeEnum.java +++ /dev/null @@ -1,23 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcTaskTypeEnum - { - ATTENDANCE, - CONSTRUCTION, - DEMOLITION, - DISMANTLE, - DISPOSAL, - INSTALLATION, - LOGISTIC, - MAINTENANCE, - MOVE, - OPERATION, - REMOVAL, - RENOVATION, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcProcessExtension/IfcWorkCalendar.java b/IfcProcessExtension/IfcWorkCalendar.java deleted file mode 100644 index fd855608..00000000 --- a/IfcProcessExtension/IfcWorkCalendar.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcWorkCalendar extends IfcControl - { - private IfcWorkTime[] WorkingTimes; - private IfcWorkTime[] ExceptionTimes; - private IfcWorkCalendarTypeEnum PredefinedType; - } -} diff --git a/IfcProcessExtension/IfcWorkCalendarTypeEnum.java b/IfcProcessExtension/IfcWorkCalendarTypeEnum.java deleted file mode 100644 index 6bb41a39..00000000 --- a/IfcProcessExtension/IfcWorkCalendarTypeEnum.java +++ /dev/null @@ -1,14 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcWorkCalendarTypeEnum - { - FIRSTSHIFT, - SECONDSHIFT, - THIRDSHIFT, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcProcessExtension/IfcWorkControl.java b/IfcProcessExtension/IfcWorkControl.java index e4427bb7..7b9a4338 100644 --- a/IfcProcessExtension/IfcWorkControl.java +++ b/IfcProcessExtension/IfcWorkControl.java @@ -5,12 +5,15 @@ { public class IfcWorkControl extends IfcControl { - private string CreationDate; + private string Identifier; + private IfcDateTimeSelect CreationDate; private IfcPerson[] Creators; private string Purpose; - private string Duration; - private string TotalFloat; - private string StartTime; - private string FinishTime; + private double Duration; + private double TotalFloat; + private IfcDateTimeSelect StartTime; + private IfcDateTimeSelect FinishTime; + private IfcWorkControlTypeEnum WorkControlType; + private string UserDefinedControlType; } } diff --git a/IfcProcessExtension/IfcWorkPlanTypeEnum.java b/IfcProcessExtension/IfcWorkControlTypeEnum.java similarity index 87% rename from IfcProcessExtension/IfcWorkPlanTypeEnum.java rename to IfcProcessExtension/IfcWorkControlTypeEnum.java index 2d02a8f0..b5a007b5 100644 --- a/IfcProcessExtension/IfcWorkPlanTypeEnum.java +++ b/IfcProcessExtension/IfcWorkControlTypeEnum.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public enum IfcWorkPlanTypeEnum + public enum IfcWorkControlTypeEnum { ACTUAL, BASELINE, diff --git a/IfcProcessExtension/IfcWorkPlan.java b/IfcProcessExtension/IfcWorkPlan.java index ddb41f9e..cb5c2d3f 100644 --- a/IfcProcessExtension/IfcWorkPlan.java +++ b/IfcProcessExtension/IfcWorkPlan.java @@ -5,6 +5,5 @@ { public class IfcWorkPlan extends IfcWorkControl { - private IfcWorkPlanTypeEnum PredefinedType; } } diff --git a/IfcProcessExtension/IfcWorkSchedule.java b/IfcProcessExtension/IfcWorkSchedule.java index 29b36081..6899e4b0 100644 --- a/IfcProcessExtension/IfcWorkSchedule.java +++ b/IfcProcessExtension/IfcWorkSchedule.java @@ -5,6 +5,5 @@ { public class IfcWorkSchedule extends IfcWorkControl { - private IfcWorkScheduleTypeEnum PredefinedType; } } diff --git a/IfcProcessExtension/IfcWorkScheduleTypeEnum.java b/IfcProcessExtension/IfcWorkScheduleTypeEnum.java deleted file mode 100644 index c74f4fb1..00000000 --- a/IfcProcessExtension/IfcWorkScheduleTypeEnum.java +++ /dev/null @@ -1,14 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcWorkScheduleTypeEnum - { - ACTUAL, - BASELINE, - PLANNED, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcSharedBldgElements/IfcBuildingElementProxy.java b/IfcProductExtension/IfcBuildingElementProxy.java similarity index 81% rename from IfcSharedBldgElements/IfcBuildingElementProxy.java rename to IfcProductExtension/IfcBuildingElementProxy.java index 1d2b7cd4..324edda7 100644 --- a/IfcSharedBldgElements/IfcBuildingElementProxy.java +++ b/IfcProductExtension/IfcBuildingElementProxy.java @@ -5,6 +5,6 @@ { public class IfcBuildingElementProxy extends IfcBuildingElement { - private IfcBuildingElementProxyTypeEnum PredefinedType; + private IfcElementCompositionEnum CompositionType; } } diff --git a/IfcSharedBldgElements/IfcBuildingElementProxyType.java b/IfcProductExtension/IfcBuildingElementProxyType.java similarity index 100% rename from IfcSharedBldgElements/IfcBuildingElementProxyType.java rename to IfcProductExtension/IfcBuildingElementProxyType.java diff --git a/IfcSharedBldgElements/IfcBuildingElementProxyTypeEnum.java b/IfcProductExtension/IfcBuildingElementProxyTypeEnum.java similarity index 78% rename from IfcSharedBldgElements/IfcBuildingElementProxyTypeEnum.java rename to IfcProductExtension/IfcBuildingElementProxyTypeEnum.java index abee9519..791547bb 100644 --- a/IfcSharedBldgElements/IfcBuildingElementProxyTypeEnum.java +++ b/IfcProductExtension/IfcBuildingElementProxyTypeEnum.java @@ -5,11 +5,6 @@ { public enum IfcBuildingElementProxyTypeEnum { - COMPLEX, - ELEMENT, - PARTIAL, - PROVISIONFORVOID, - PROVISIONFORSPACE, USERDEFINED, NOTDEFINED, } diff --git a/IfcProductExtension/IfcCivilElement.java b/IfcProductExtension/IfcCivilElement.java deleted file mode 100644 index 24b80e10..00000000 --- a/IfcProductExtension/IfcCivilElement.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCivilElement extends IfcElement - { - } -} diff --git a/IfcProductExtension/IfcCivilElementType.java b/IfcProductExtension/IfcCivilElementType.java deleted file mode 100644 index c51c21d3..00000000 --- a/IfcProductExtension/IfcCivilElementType.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCivilElementType extends IfcElementType - { - } -} diff --git a/IfcSharedBldgElements/IfcCovering.java b/IfcProductExtension/IfcCovering.java similarity index 86% rename from IfcSharedBldgElements/IfcCovering.java rename to IfcProductExtension/IfcCovering.java index 838c2b10..c31da0ed 100644 --- a/IfcSharedBldgElements/IfcCovering.java +++ b/IfcProductExtension/IfcCovering.java @@ -7,6 +7,6 @@ public class IfcCovering extends IfcBuildingElement { private IfcCoveringTypeEnum PredefinedType; private IfcRelCoversSpaces[] CoversSpaces; - private IfcRelCoversBldgElements[] CoversElements; + private IfcRelCoversBldgElements[] Covers; } } diff --git a/IfcSharedBldgElements/IfcCoveringType.java b/IfcProductExtension/IfcCoveringType.java similarity index 100% rename from IfcSharedBldgElements/IfcCoveringType.java rename to IfcProductExtension/IfcCoveringType.java diff --git a/IfcSharedBldgElements/IfcCoveringTypeEnum.java b/IfcProductExtension/IfcCoveringTypeEnum.java similarity index 92% rename from IfcSharedBldgElements/IfcCoveringTypeEnum.java rename to IfcProductExtension/IfcCoveringTypeEnum.java index 69810bbc..babfe00b 100644 --- a/IfcSharedBldgElements/IfcCoveringTypeEnum.java +++ b/IfcProductExtension/IfcCoveringTypeEnum.java @@ -9,8 +9,6 @@ public enum IfcCoveringTypeEnum FLOORING, CLADDING, ROOFING, - MOLDING, - SKIRTINGBOARD, INSULATION, MEMBRANE, SLEEVING, diff --git a/IfcProductExtension/IfcDistributionElement.java b/IfcProductExtension/IfcDistributionElement.java index e5fa54f4..f1d296c6 100644 --- a/IfcProductExtension/IfcDistributionElement.java +++ b/IfcProductExtension/IfcDistributionElement.java @@ -5,6 +5,5 @@ { public class IfcDistributionElement extends IfcElement { - private IfcRelConnectsPortToElement[] HasPorts; } } diff --git a/IfcProductExtension/IfcElectricalElement.java b/IfcProductExtension/IfcElectricalElement.java new file mode 100644 index 00000000..7dd74771 --- /dev/null +++ b/IfcProductExtension/IfcElectricalElement.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcElectricalElement extends IfcElement + { + } +} diff --git a/IfcProductExtension/IfcElement.java b/IfcProductExtension/IfcElement.java index a278ac9b..759a57eb 100644 --- a/IfcProductExtension/IfcElement.java +++ b/IfcProductExtension/IfcElement.java @@ -6,17 +6,17 @@ public class IfcElement extends IfcProduct { private string Tag; + private IfcRelConnectsStructuralElement[] HasStructuralMember; private IfcRelFillsElement[] FillsVoids; private IfcRelConnectsElements[] ConnectedTo; - private IfcRelInterferesElements[] IsInterferedByElements; - private IfcRelInterferesElements[] InterferesElements; + private IfcRelCoversBldgElements[] HasCoverings; private IfcRelProjectsElement[] HasProjections; private IfcRelReferencedInSpatialStructure[] ReferencedInStructures; + private IfcRelConnectsPortToElement[] HasPorts; private IfcRelVoidsElement[] HasOpenings; private IfcRelConnectsWithRealizingElements[] IsConnectionRealization; private IfcRelSpaceBoundary[] ProvidesBoundaries; private IfcRelConnectsElements[] ConnectedFrom; private IfcRelContainedInSpatialStructure[] ContainedInStructure; - private IfcRelCoversBldgElements[] HasCoverings; } } diff --git a/IfcProductExtension/IfcElementAssemblyType.java b/IfcProductExtension/IfcElementAssemblyType.java deleted file mode 100644 index 1b668b22..00000000 --- a/IfcProductExtension/IfcElementAssemblyType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcElementAssemblyType extends IfcElementType - { - private IfcElementAssemblyTypeEnum PredefinedType; - } -} diff --git a/IfcProductExtension/IfcElementQuantity.java b/IfcProductExtension/IfcElementQuantity.java index b782f9cd..4e5aa482 100644 --- a/IfcProductExtension/IfcElementQuantity.java +++ b/IfcProductExtension/IfcElementQuantity.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcElementQuantity extends IfcQuantitySet + public class IfcElementQuantity extends IfcPropertySetDefinition { private string MethodOfMeasurement; private IfcPhysicalQuantity[] Quantities; diff --git a/IfcProductExtension/IfcEquipmentElement.java b/IfcProductExtension/IfcEquipmentElement.java new file mode 100644 index 00000000..aafb9da9 --- /dev/null +++ b/IfcProductExtension/IfcEquipmentElement.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcEquipmentElement extends IfcElement + { + } +} diff --git a/IfcProductExtension/IfcExternalSpatialElement.java b/IfcProductExtension/IfcExternalSpatialElement.java deleted file mode 100644 index e66bf228..00000000 --- a/IfcProductExtension/IfcExternalSpatialElement.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcExternalSpatialElement extends IfcExternalSpatialStructureElement - { - private IfcExternalSpatialElementTypeEnum PredefinedType; - private IfcRelSpaceBoundary[] BoundedBy; - } -} diff --git a/IfcProductExtension/IfcExternalSpatialElementTypeEnum.java b/IfcProductExtension/IfcExternalSpatialElementTypeEnum.java deleted file mode 100644 index 4c7e4548..00000000 --- a/IfcProductExtension/IfcExternalSpatialElementTypeEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcExternalSpatialElementTypeEnum - { - EXTERNAL, - EXTERNAL_EARTH, - EXTERNAL_WATER, - EXTERNAL_FIRE, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcProductExtension/IfcExternalSpatialStructureElement.java b/IfcProductExtension/IfcExternalSpatialStructureElement.java deleted file mode 100644 index 53ac384d..00000000 --- a/IfcProductExtension/IfcExternalSpatialStructureElement.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcExternalSpatialStructureElement extends IfcSpatialElement - { - } -} diff --git a/IfcProductExtension/IfcGeographicElement.java b/IfcProductExtension/IfcGeographicElement.java deleted file mode 100644 index 4774166d..00000000 --- a/IfcProductExtension/IfcGeographicElement.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcGeographicElement extends IfcElement - { - private IfcGeographicElementTypeEnum PredefinedType; - } -} diff --git a/IfcProductExtension/IfcGeographicElementType.java b/IfcProductExtension/IfcGeographicElementType.java deleted file mode 100644 index 4ef15db9..00000000 --- a/IfcProductExtension/IfcGeographicElementType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcGeographicElementType extends IfcElementType - { - private IfcGeographicElementTypeEnum PredefinedType; - } -} diff --git a/IfcProductExtension/IfcGrid.java b/IfcProductExtension/IfcGrid.java index b3dae2ce..8c27a0d9 100644 --- a/IfcProductExtension/IfcGrid.java +++ b/IfcProductExtension/IfcGrid.java @@ -8,7 +8,6 @@ public class IfcGrid extends IfcProduct private IfcGridAxis[] UAxes; private IfcGridAxis[] VAxes; private IfcGridAxis[] WAxes; - private IfcGridTypeEnum PredefinedType; private IfcRelContainedInSpatialStructure[] ContainedInStructure; } } diff --git a/IfcProductExtension/IfcGridTypeEnum.java b/IfcProductExtension/IfcGridTypeEnum.java deleted file mode 100644 index d03c7ff8..00000000 --- a/IfcProductExtension/IfcGridTypeEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcGridTypeEnum - { - RECTANGULAR, - RADIAL, - TRIANGULAR, - IRREGULAR, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcProductExtension/IfcInternalOrExternalEnum.java b/IfcProductExtension/IfcInternalOrExternalEnum.java index b38bbac4..17c491e0 100644 --- a/IfcProductExtension/IfcInternalOrExternalEnum.java +++ b/IfcProductExtension/IfcInternalOrExternalEnum.java @@ -7,9 +7,6 @@ public enum IfcInternalOrExternalEnum { INTERNAL, EXTERNAL, - EXTERNAL_EARTH, - EXTERNAL_WATER, - EXTERNAL_FIRE, NOTDEFINED, } } diff --git a/IfcProductExtension/IfcOpeningElement.java b/IfcProductExtension/IfcOpeningElement.java index 945bdb28..ef18b871 100644 --- a/IfcProductExtension/IfcOpeningElement.java +++ b/IfcProductExtension/IfcOpeningElement.java @@ -5,7 +5,6 @@ { public class IfcOpeningElement extends IfcFeatureElementSubtraction { - private IfcOpeningElementTypeEnum PredefinedType; private IfcRelFillsElement[] HasFillings; } } diff --git a/IfcProductExtension/IfcOpeningElementTypeEnum.java b/IfcProductExtension/IfcOpeningElementTypeEnum.java deleted file mode 100644 index b901e59b..00000000 --- a/IfcProductExtension/IfcOpeningElementTypeEnum.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcOpeningElementTypeEnum - { - OPENING, - RECESS, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcProductExtension/IfcOpeningStandardCase.java b/IfcProductExtension/IfcOpeningStandardCase.java deleted file mode 100644 index 949033e4..00000000 --- a/IfcProductExtension/IfcOpeningStandardCase.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcOpeningStandardCase extends IfcOpeningElement - { - } -} diff --git a/IfcProductExtension/IfcPort.java b/IfcProductExtension/IfcPort.java index a62b57af..3980435d 100644 --- a/IfcProductExtension/IfcPort.java +++ b/IfcProductExtension/IfcPort.java @@ -5,7 +5,7 @@ { public class IfcPort extends IfcProduct { - private IfcRelConnectsPortToElement[] ContainedIn; + private IfcRelConnectsPortToElement ContainedIn; private IfcRelConnectsPorts[] ConnectedFrom; private IfcRelConnectsPorts[] ConnectedTo; } diff --git a/IfcProductExtension/IfcProjectionElement.java b/IfcProductExtension/IfcProjectionElement.java index dd8fc130..b276fa06 100644 --- a/IfcProductExtension/IfcProjectionElement.java +++ b/IfcProductExtension/IfcProjectionElement.java @@ -5,6 +5,5 @@ { public class IfcProjectionElement extends IfcFeatureElementAddition { - private IfcProjectionElementTypeEnum PredefinedType; } } diff --git a/IfcProductExtension/IfcProjectionElementTypeEnum.java b/IfcProductExtension/IfcProjectionElementTypeEnum.java deleted file mode 100644 index ee672277..00000000 --- a/IfcProductExtension/IfcProjectionElementTypeEnum.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcProjectionElementTypeEnum - { - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcProductExtension/IfcRelConnectsPortToElement.java b/IfcProductExtension/IfcRelConnectsPortToElement.java index 86689c96..512387ad 100644 --- a/IfcProductExtension/IfcRelConnectsPortToElement.java +++ b/IfcProductExtension/IfcRelConnectsPortToElement.java @@ -6,6 +6,6 @@ public class IfcRelConnectsPortToElement extends IfcRelConnects { private IfcPort RelatingPort; - private IfcDistributionElement RelatedElement; + private IfcElement RelatedElement; } } diff --git a/IfcProductExtension/IfcRelContainedInSpatialStructure.java b/IfcProductExtension/IfcRelContainedInSpatialStructure.java index fb1e3da4..f825a10b 100644 --- a/IfcProductExtension/IfcRelContainedInSpatialStructure.java +++ b/IfcProductExtension/IfcRelContainedInSpatialStructure.java @@ -6,6 +6,6 @@ public class IfcRelContainedInSpatialStructure extends IfcRelConnects { private IfcProduct[] RelatedElements; - private IfcSpatialElement RelatingStructure; + private IfcSpatialStructureElement RelatingStructure; } } diff --git a/IfcSharedBldgElements/IfcRelCoversBldgElements.java b/IfcProductExtension/IfcRelCoversBldgElements.java similarity index 100% rename from IfcSharedBldgElements/IfcRelCoversBldgElements.java rename to IfcProductExtension/IfcRelCoversBldgElements.java diff --git a/IfcSharedBldgElements/IfcRelCoversSpaces.java b/IfcProductExtension/IfcRelCoversSpaces.java similarity index 89% rename from IfcSharedBldgElements/IfcRelCoversSpaces.java rename to IfcProductExtension/IfcRelCoversSpaces.java index 632332cf..c4842a0f 100644 --- a/IfcSharedBldgElements/IfcRelCoversSpaces.java +++ b/IfcProductExtension/IfcRelCoversSpaces.java @@ -5,7 +5,7 @@ { public class IfcRelCoversSpaces extends IfcRelConnects { - private IfcSpace RelatingSpace; + private IfcSpace RelatedSpace; private IfcCovering[] RelatedCoverings; } } diff --git a/IfcProductExtension/IfcRelInterferesElements.java b/IfcProductExtension/IfcRelInterferesElements.java deleted file mode 100644 index b39e9594..00000000 --- a/IfcProductExtension/IfcRelInterferesElements.java +++ /dev/null @@ -1,14 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcRelInterferesElements extends IfcRelConnects - { - private IfcElement RelatingElement; - private IfcElement RelatedElement; - private IfcConnectionGeometry InterferenceGeometry; - private string InterferenceType; - private LOGICAL ImpliedOrder; - } -} diff --git a/IfcProductExtension/IfcRelProjectsElement.java b/IfcProductExtension/IfcRelProjectsElement.java index 1fbe763f..17030e02 100644 --- a/IfcProductExtension/IfcRelProjectsElement.java +++ b/IfcProductExtension/IfcRelProjectsElement.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcRelProjectsElement extends IfcRelDecomposes + public class IfcRelProjectsElement extends IfcRelConnects { private IfcElement RelatingElement; private IfcFeatureElementAddition RelatedFeatureElement; diff --git a/IfcProductExtension/IfcRelReferencedInSpatialStructure.java b/IfcProductExtension/IfcRelReferencedInSpatialStructure.java index b9884b8a..c15438f0 100644 --- a/IfcProductExtension/IfcRelReferencedInSpatialStructure.java +++ b/IfcProductExtension/IfcRelReferencedInSpatialStructure.java @@ -6,6 +6,6 @@ public class IfcRelReferencedInSpatialStructure extends IfcRelConnects { private IfcProduct[] RelatedElements; - private IfcSpatialElement RelatingStructure; + private IfcSpatialStructureElement RelatingStructure; } } diff --git a/IfcProductExtension/IfcRelServicesBuildings.java b/IfcProductExtension/IfcRelServicesBuildings.java index 94e2b2da..b05d8a7f 100644 --- a/IfcProductExtension/IfcRelServicesBuildings.java +++ b/IfcProductExtension/IfcRelServicesBuildings.java @@ -6,6 +6,6 @@ public class IfcRelServicesBuildings extends IfcRelConnects { private IfcSystem RelatingSystem; - private IfcSpatialElement[] RelatedBuildings; + private IfcSpatialStructureElement[] RelatedBuildings; } } diff --git a/IfcProductExtension/IfcRelSpaceBoundary.java b/IfcProductExtension/IfcRelSpaceBoundary.java index 248ddf8c..ab721de2 100644 --- a/IfcProductExtension/IfcRelSpaceBoundary.java +++ b/IfcProductExtension/IfcRelSpaceBoundary.java @@ -5,7 +5,7 @@ { public class IfcRelSpaceBoundary extends IfcRelConnects { - private IfcSpaceBoundarySelect RelatingSpace; + private IfcSpace RelatingSpace; private IfcElement RelatedBuildingElement; private IfcConnectionGeometry ConnectionGeometry; private IfcPhysicalOrVirtualEnum PhysicalOrVirtualBoundary; diff --git a/IfcProductExtension/IfcRelSpaceBoundary1stLevel.java b/IfcProductExtension/IfcRelSpaceBoundary1stLevel.java deleted file mode 100644 index 253715f0..00000000 --- a/IfcProductExtension/IfcRelSpaceBoundary1stLevel.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcRelSpaceBoundary1stLevel extends IfcRelSpaceBoundary - { - private IfcRelSpaceBoundary1stLevel ParentBoundary; - private IfcRelSpaceBoundary1stLevel[] InnerBoundaries; - } -} diff --git a/IfcProductExtension/IfcRelSpaceBoundary2ndLevel.java b/IfcProductExtension/IfcRelSpaceBoundary2ndLevel.java deleted file mode 100644 index c0e8bf3c..00000000 --- a/IfcProductExtension/IfcRelSpaceBoundary2ndLevel.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcRelSpaceBoundary2ndLevel extends IfcRelSpaceBoundary1stLevel - { - private IfcRelSpaceBoundary2ndLevel CorrespondingBoundary; - private IfcRelSpaceBoundary2ndLevel[] Corresponds; - } -} diff --git a/IfcProductExtension/IfcRelVoidsElement.java b/IfcProductExtension/IfcRelVoidsElement.java index ed238088..179b8123 100644 --- a/IfcProductExtension/IfcRelVoidsElement.java +++ b/IfcProductExtension/IfcRelVoidsElement.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcRelVoidsElement extends IfcRelDecomposes + public class IfcRelVoidsElement extends IfcRelConnects { private IfcElement RelatingBuildingElement; private IfcFeatureElementSubtraction RelatedOpeningElement; diff --git a/IfcProductExtension/IfcSpace.java b/IfcProductExtension/IfcSpace.java index c85664d8..ba31d1f1 100644 --- a/IfcProductExtension/IfcSpace.java +++ b/IfcProductExtension/IfcSpace.java @@ -5,7 +5,7 @@ { public class IfcSpace extends IfcSpatialStructureElement { - private IfcSpaceTypeEnum PredefinedType; + private IfcInternalOrExternalEnum InteriorOrExteriorSpace; private double ElevationWithFlooring; private IfcRelCoversSpaces[] HasCoverings; private IfcRelSpaceBoundary[] BoundedBy; diff --git a/IfcProductExtension/IfcSpaceBoundarySelect.java b/IfcProductExtension/IfcSpaceBoundarySelect.java deleted file mode 100644 index b9989888..00000000 --- a/IfcProductExtension/IfcSpaceBoundarySelect.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public interface IfcSpaceBoundarySelect - { - } -} diff --git a/IfcProductExtension/IfcSpaceType.java b/IfcProductExtension/IfcSpaceType.java index bbd278ac..0f4bf598 100644 --- a/IfcProductExtension/IfcSpaceType.java +++ b/IfcProductExtension/IfcSpaceType.java @@ -6,6 +6,5 @@ public class IfcSpaceType extends IfcSpatialStructureElementType { private IfcSpaceTypeEnum PredefinedType; - private string LongName; } } diff --git a/IfcProductExtension/IfcSpaceTypeEnum.java b/IfcProductExtension/IfcSpaceTypeEnum.java index 480b460e..17094f46 100644 --- a/IfcProductExtension/IfcSpaceTypeEnum.java +++ b/IfcProductExtension/IfcSpaceTypeEnum.java @@ -5,11 +5,6 @@ { public enum IfcSpaceTypeEnum { - SPACE, - PARKING, - GFA, - INTERNAL, - EXTERNAL, USERDEFINED, NOTDEFINED, } diff --git a/IfcProductExtension/IfcSpatialElement.java b/IfcProductExtension/IfcSpatialElement.java deleted file mode 100644 index 49b9fc71..00000000 --- a/IfcProductExtension/IfcSpatialElement.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSpatialElement extends IfcProduct - { - private string LongName; - private IfcRelContainedInSpatialStructure[] ContainsElements; - private IfcRelServicesBuildings[] ServicedBySystems; - private IfcRelReferencedInSpatialStructure[] ReferencesElements; - } -} diff --git a/IfcProductExtension/IfcSpatialElementType.java b/IfcProductExtension/IfcSpatialElementType.java deleted file mode 100644 index afba1c49..00000000 --- a/IfcProductExtension/IfcSpatialElementType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSpatialElementType extends IfcTypeProduct - { - private string ElementType; - } -} diff --git a/IfcProductExtension/IfcSpatialStructureElement.java b/IfcProductExtension/IfcSpatialStructureElement.java index f57cb86b..44059b2a 100644 --- a/IfcProductExtension/IfcSpatialStructureElement.java +++ b/IfcProductExtension/IfcSpatialStructureElement.java @@ -3,8 +3,12 @@ package buildingsmart.ifc { - public class IfcSpatialStructureElement extends IfcSpatialElement + public class IfcSpatialStructureElement extends IfcProduct { + private string LongName; private IfcElementCompositionEnum CompositionType; + private IfcRelReferencedInSpatialStructure[] ReferencesElements; + private IfcRelServicesBuildings[] ServicedBySystems; + private IfcRelContainedInSpatialStructure[] ContainsElements; } } diff --git a/IfcProductExtension/IfcSpatialStructureElementType.java b/IfcProductExtension/IfcSpatialStructureElementType.java index 51454606..6390d3c1 100644 --- a/IfcProductExtension/IfcSpatialStructureElementType.java +++ b/IfcProductExtension/IfcSpatialStructureElementType.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcSpatialStructureElementType extends IfcSpatialElementType + public class IfcSpatialStructureElementType extends IfcElementType { } } diff --git a/IfcProductExtension/IfcSpatialZone.java b/IfcProductExtension/IfcSpatialZone.java deleted file mode 100644 index 39fd7f89..00000000 --- a/IfcProductExtension/IfcSpatialZone.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSpatialZone extends IfcSpatialElement - { - private IfcSpatialZoneTypeEnum PredefinedType; - } -} diff --git a/IfcProductExtension/IfcSpatialZoneType.java b/IfcProductExtension/IfcSpatialZoneType.java deleted file mode 100644 index 3031aa8d..00000000 --- a/IfcProductExtension/IfcSpatialZoneType.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSpatialZoneType extends IfcSpatialElementType - { - private IfcSpatialZoneTypeEnum PredefinedType; - private string LongName; - } -} diff --git a/IfcProductExtension/IfcTransportElement.java b/IfcProductExtension/IfcTransportElement.java index 5ee49037..02f6c41d 100644 --- a/IfcProductExtension/IfcTransportElement.java +++ b/IfcProductExtension/IfcTransportElement.java @@ -5,6 +5,8 @@ { public class IfcTransportElement extends IfcElement { - private IfcTransportElementTypeEnum PredefinedType; + private IfcTransportElementTypeEnum OperationType; + private double CapacityByWeight; + private NUMBER CapacityByNumber; } } diff --git a/IfcProductExtension/IfcTransportElementTypeEnum.java b/IfcProductExtension/IfcTransportElementTypeEnum.java index fe9f8c5b..571ca466 100644 --- a/IfcProductExtension/IfcTransportElementTypeEnum.java +++ b/IfcProductExtension/IfcTransportElementTypeEnum.java @@ -8,8 +8,6 @@ public enum IfcTransportElementTypeEnum ELEVATOR, ESCALATOR, MOVINGWALKWAY, - CRANEWAY, - LIFTINGGEAR, USERDEFINED, NOTDEFINED, } diff --git a/IfcProductExtension/IfcZone.java b/IfcProductExtension/IfcZone.java index 8dd45e3d..a9bd29e5 100644 --- a/IfcProductExtension/IfcZone.java +++ b/IfcProductExtension/IfcZone.java @@ -3,8 +3,7 @@ package buildingsmart.ifc { - public class IfcZone extends IfcSystem + public class IfcZone extends IfcGroup { - private string LongName; } } diff --git a/IfcProfileResource/IfcAsymmetricIShapeProfileDef.java b/IfcProfileResource/IfcAsymmetricIShapeProfileDef.java index fc01df14..433881f8 100644 --- a/IfcProfileResource/IfcAsymmetricIShapeProfileDef.java +++ b/IfcProfileResource/IfcAsymmetricIShapeProfileDef.java @@ -3,19 +3,11 @@ package buildingsmart.ifc { - public class IfcAsymmetricIShapeProfileDef extends IfcParameterizedProfileDef + public class IfcAsymmetricIShapeProfileDef extends IfcIShapeProfileDef { - private IfcLengthMeasure BottomFlangeWidth; - private IfcLengthMeasure OverallDepth; - private IfcLengthMeasure WebThickness; - private IfcLengthMeasure BottomFlangeThickness; - private IfcLengthMeasure BottomFlangeFilletRadius; private IfcLengthMeasure TopFlangeWidth; private IfcLengthMeasure TopFlangeThickness; private IfcLengthMeasure TopFlangeFilletRadius; - private IfcLengthMeasure BottomFlangeEdgeRadius; - private double BottomFlangeSlope; - private IfcLengthMeasure TopFlangeEdgeRadius; - private double TopFlangeSlope; + private IfcLengthMeasure CentreOfGravityInY; } } diff --git a/IfcProfileResource/IfcCShapeProfileDef.java b/IfcProfileResource/IfcCShapeProfileDef.java index 97d70819..2b1353e4 100644 --- a/IfcProfileResource/IfcCShapeProfileDef.java +++ b/IfcProfileResource/IfcCShapeProfileDef.java @@ -10,5 +10,6 @@ public class IfcCShapeProfileDef extends IfcParameterizedProfileDef private IfcLengthMeasure WallThickness; private IfcLengthMeasure Girth; private IfcLengthMeasure InternalFilletRadius; + private IfcLengthMeasure CentreOfGravityInX; } } diff --git a/IfcProfileResource/IfcCraneRailAShapeProfileDef.java b/IfcProfileResource/IfcCraneRailAShapeProfileDef.java new file mode 100644 index 00000000..e047b429 --- /dev/null +++ b/IfcProfileResource/IfcCraneRailAShapeProfileDef.java @@ -0,0 +1,21 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcCraneRailAShapeProfileDef extends IfcParameterizedProfileDef + { + private IfcLengthMeasure OverallHeight; + private IfcLengthMeasure BaseWidth2; + private IfcLengthMeasure Radius; + private IfcLengthMeasure HeadWidth; + private IfcLengthMeasure HeadDepth2; + private IfcLengthMeasure HeadDepth3; + private IfcLengthMeasure WebThickness; + private IfcLengthMeasure BaseWidth4; + private IfcLengthMeasure BaseDepth1; + private IfcLengthMeasure BaseDepth2; + private IfcLengthMeasure BaseDepth3; + private IfcLengthMeasure CentreOfGravityInY; + } +} diff --git a/IfcProfileResource/IfcCraneRailFShapeProfileDef.java b/IfcProfileResource/IfcCraneRailFShapeProfileDef.java new file mode 100644 index 00000000..1af2576d --- /dev/null +++ b/IfcProfileResource/IfcCraneRailFShapeProfileDef.java @@ -0,0 +1,18 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcCraneRailFShapeProfileDef extends IfcParameterizedProfileDef + { + private IfcLengthMeasure OverallHeight; + private IfcLengthMeasure HeadWidth; + private IfcLengthMeasure Radius; + private IfcLengthMeasure HeadDepth2; + private IfcLengthMeasure HeadDepth3; + private IfcLengthMeasure WebThickness; + private IfcLengthMeasure BaseDepth1; + private IfcLengthMeasure BaseDepth2; + private IfcLengthMeasure CentreOfGravityInY; + } +} diff --git a/IfcProfileResource/IfcIShapeProfileDef.java b/IfcProfileResource/IfcIShapeProfileDef.java index 81044525..e2eb5e4c 100644 --- a/IfcProfileResource/IfcIShapeProfileDef.java +++ b/IfcProfileResource/IfcIShapeProfileDef.java @@ -10,7 +10,5 @@ public class IfcIShapeProfileDef extends IfcParameterizedProfileDef private IfcLengthMeasure WebThickness; private IfcLengthMeasure FlangeThickness; private IfcLengthMeasure FilletRadius; - private IfcLengthMeasure FlangeEdgeRadius; - private double FlangeSlope; } } diff --git a/IfcProfileResource/IfcLShapeProfileDef.java b/IfcProfileResource/IfcLShapeProfileDef.java index b0ff691a..83651e8d 100644 --- a/IfcProfileResource/IfcLShapeProfileDef.java +++ b/IfcProfileResource/IfcLShapeProfileDef.java @@ -11,5 +11,7 @@ public class IfcLShapeProfileDef extends IfcParameterizedProfileDef private IfcLengthMeasure FilletRadius; private IfcLengthMeasure EdgeRadius; private double LegSlope; + private IfcLengthMeasure CentreOfGravityInX; + private IfcLengthMeasure CentreOfGravityInY; } } diff --git a/IfcProfileResource/IfcMirroredProfileDef.java b/IfcProfileResource/IfcMirroredProfileDef.java deleted file mode 100644 index a00aff6e..00000000 --- a/IfcProfileResource/IfcMirroredProfileDef.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMirroredProfileDef extends IfcDerivedProfileDef - { - private IfcCartesianTransformationOperator2D Operator; - } -} diff --git a/IfcProfileResource/IfcProfileDef.java b/IfcProfileResource/IfcProfileDef.java index 93c20a45..4d334e78 100644 --- a/IfcProfileResource/IfcProfileDef.java +++ b/IfcProfileResource/IfcProfileDef.java @@ -7,7 +7,5 @@ public class IfcProfileDef extends IfcBase { private IfcProfileTypeEnum ProfileType; private string ProfileName; - private IfcExternalReferenceRelationship[] HasExternalReference; - private IfcProfileProperties[] HasProperties; } } diff --git a/IfcProfileResource/IfcTShapeProfileDef.java b/IfcProfileResource/IfcTShapeProfileDef.java index 54524571..0900863f 100644 --- a/IfcProfileResource/IfcTShapeProfileDef.java +++ b/IfcProfileResource/IfcTShapeProfileDef.java @@ -14,5 +14,6 @@ public class IfcTShapeProfileDef extends IfcParameterizedProfileDef private IfcLengthMeasure WebEdgeRadius; private double WebSlope; private double FlangeSlope; + private IfcLengthMeasure CentreOfGravityInY; } } diff --git a/IfcProfileResource/IfcUShapeProfileDef.java b/IfcProfileResource/IfcUShapeProfileDef.java index 10d60d3e..0881f020 100644 --- a/IfcProfileResource/IfcUShapeProfileDef.java +++ b/IfcProfileResource/IfcUShapeProfileDef.java @@ -12,5 +12,6 @@ public class IfcUShapeProfileDef extends IfcParameterizedProfileDef private IfcLengthMeasure FilletRadius; private IfcLengthMeasure EdgeRadius; private double FlangeSlope; + private IfcLengthMeasure CentreOfGravityInX; } } diff --git a/IfcPropertyResource/IfcCurveInterpolationEnum.java b/IfcPropertyResource/IfcCurveInterpolationEnum.java deleted file mode 100644 index 33476e84..00000000 --- a/IfcPropertyResource/IfcCurveInterpolationEnum.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcCurveInterpolationEnum - { - LINEAR, - LOG_LINEAR, - LOG_LOG, - NOTDEFINED, - } -} diff --git a/IfcPropertyResource/IfcPreDefinedProperties.java b/IfcPropertyResource/IfcPreDefinedProperties.java deleted file mode 100644 index 9efee972..00000000 --- a/IfcPropertyResource/IfcPreDefinedProperties.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcPreDefinedProperties extends IfcPropertyAbstraction - { - } -} diff --git a/IfcPropertyResource/IfcProperty.java b/IfcPropertyResource/IfcProperty.java index 0e08f09e..d92d4f25 100644 --- a/IfcPropertyResource/IfcProperty.java +++ b/IfcPropertyResource/IfcProperty.java @@ -3,15 +3,12 @@ package buildingsmart.ifc { - public class IfcProperty extends IfcPropertyAbstraction + public class IfcProperty extends IfcBase { private string Name; private string Description; - private IfcPropertySet[] PartOfPset; private IfcPropertyDependencyRelationship[] PropertyForDependance; private IfcPropertyDependencyRelationship[] PropertyDependsOn; private IfcComplexProperty[] PartOfComplex; - private IfcResourceConstraintRelationship[] HasConstraints; - private IfcResourceApprovalRelationship[] HasApprovals; } } diff --git a/IfcPropertyResource/IfcPropertyAbstraction.java b/IfcPropertyResource/IfcPropertyAbstraction.java deleted file mode 100644 index 7ef7a2c0..00000000 --- a/IfcPropertyResource/IfcPropertyAbstraction.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcPropertyAbstraction extends IfcBase - { - private IfcExternalReferenceRelationship[] HasExternalReferences; - } -} diff --git a/IfcPropertyResource/IfcPropertyBoundedValue.java b/IfcPropertyResource/IfcPropertyBoundedValue.java index a38f03a0..9830640a 100644 --- a/IfcPropertyResource/IfcPropertyBoundedValue.java +++ b/IfcPropertyResource/IfcPropertyBoundedValue.java @@ -8,6 +8,5 @@ public class IfcPropertyBoundedValue extends IfcSimpleProperty private IfcValue UpperBoundValue; private IfcValue LowerBoundValue; private IfcUnit Unit; - private IfcValue SetPointValue; } } diff --git a/IfcPropertyResource/IfcPropertyDependencyRelationship.java b/IfcPropertyResource/IfcPropertyDependencyRelationship.java index 9634f9d6..354e2a4a 100644 --- a/IfcPropertyResource/IfcPropertyDependencyRelationship.java +++ b/IfcPropertyResource/IfcPropertyDependencyRelationship.java @@ -3,10 +3,12 @@ package buildingsmart.ifc { - public class IfcPropertyDependencyRelationship extends IfcResourceLevelRelationship + public class IfcPropertyDependencyRelationship extends IfcBase { private IfcProperty DependingProperty; private IfcProperty DependantProperty; + private string Name; + private string Description; private string Expression; } } diff --git a/IfcPropertyResource/IfcPropertyEnumeration.java b/IfcPropertyResource/IfcPropertyEnumeration.java index 48dc7c1a..137f521b 100644 --- a/IfcPropertyResource/IfcPropertyEnumeration.java +++ b/IfcPropertyResource/IfcPropertyEnumeration.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcPropertyEnumeration extends IfcPropertyAbstraction + public class IfcPropertyEnumeration extends IfcBase { private string Name; private IfcValue[] EnumerationValues; diff --git a/IfcPropertyResource/IfcPropertyTableValue.java b/IfcPropertyResource/IfcPropertyTableValue.java index e90d8a54..a085b6da 100644 --- a/IfcPropertyResource/IfcPropertyTableValue.java +++ b/IfcPropertyResource/IfcPropertyTableValue.java @@ -10,6 +10,5 @@ public class IfcPropertyTableValue extends IfcSimpleProperty private string Expression; private IfcUnit DefiningUnit; private IfcUnit DefinedUnit; - private IfcCurveInterpolationEnum CurveInterpolation; } } diff --git a/IfcQuantityResource/IfcPhysicalQuantity.java b/IfcQuantityResource/IfcPhysicalQuantity.java index 5b40b4a4..410d6988 100644 --- a/IfcQuantityResource/IfcPhysicalQuantity.java +++ b/IfcQuantityResource/IfcPhysicalQuantity.java @@ -7,7 +7,6 @@ public class IfcPhysicalQuantity extends IfcBase { private string Name; private string Description; - private IfcExternalReferenceRelationship[] HasExternalReferences; private IfcPhysicalComplexQuantity[] PartOfComplex; } } diff --git a/IfcQuantityResource/IfcQuantityArea.java b/IfcQuantityResource/IfcQuantityArea.java index 6ad5cb5b..9b68242a 100644 --- a/IfcQuantityResource/IfcQuantityArea.java +++ b/IfcQuantityResource/IfcQuantityArea.java @@ -6,6 +6,5 @@ public class IfcQuantityArea extends IfcPhysicalSimpleQuantity { private double AreaValue; - private string Formula; } } diff --git a/IfcQuantityResource/IfcQuantityCount.java b/IfcQuantityResource/IfcQuantityCount.java index 2a6929cf..1a6baf37 100644 --- a/IfcQuantityResource/IfcQuantityCount.java +++ b/IfcQuantityResource/IfcQuantityCount.java @@ -6,6 +6,5 @@ public class IfcQuantityCount extends IfcPhysicalSimpleQuantity { private NUMBER CountValue; - private string Formula; } } diff --git a/IfcQuantityResource/IfcQuantityLength.java b/IfcQuantityResource/IfcQuantityLength.java index 543203b7..ade0170c 100644 --- a/IfcQuantityResource/IfcQuantityLength.java +++ b/IfcQuantityResource/IfcQuantityLength.java @@ -6,6 +6,5 @@ public class IfcQuantityLength extends IfcPhysicalSimpleQuantity { private double LengthValue; - private string Formula; } } diff --git a/IfcQuantityResource/IfcQuantityTime.java b/IfcQuantityResource/IfcQuantityTime.java index 41859bfe..78534eee 100644 --- a/IfcQuantityResource/IfcQuantityTime.java +++ b/IfcQuantityResource/IfcQuantityTime.java @@ -6,6 +6,5 @@ public class IfcQuantityTime extends IfcPhysicalSimpleQuantity { private double TimeValue; - private string Formula; } } diff --git a/IfcQuantityResource/IfcQuantityVolume.java b/IfcQuantityResource/IfcQuantityVolume.java index 880f5d31..4e945eb2 100644 --- a/IfcQuantityResource/IfcQuantityVolume.java +++ b/IfcQuantityResource/IfcQuantityVolume.java @@ -6,6 +6,5 @@ public class IfcQuantityVolume extends IfcPhysicalSimpleQuantity { private double VolumeValue; - private string Formula; } } diff --git a/IfcQuantityResource/IfcQuantityWeight.java b/IfcQuantityResource/IfcQuantityWeight.java index 7d15b3b2..1cf7cba1 100644 --- a/IfcQuantityResource/IfcQuantityWeight.java +++ b/IfcQuantityResource/IfcQuantityWeight.java @@ -6,6 +6,5 @@ public class IfcQuantityWeight extends IfcPhysicalSimpleQuantity { private double WeightValue; - private string Formula; } } diff --git a/IfcRepresentationResource/IfcCoordinateOperation.java b/IfcRepresentationResource/IfcCoordinateOperation.java deleted file mode 100644 index 342eb688..00000000 --- a/IfcRepresentationResource/IfcCoordinateOperation.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCoordinateOperation extends IfcBase - { - private IfcCoordinateReferenceSystemSelect SourceCRS; - private IfcCoordinateReferenceSystem TargetCRS; - } -} diff --git a/IfcRepresentationResource/IfcCoordinateReferenceSystem.java b/IfcRepresentationResource/IfcCoordinateReferenceSystem.java deleted file mode 100644 index 0e5c7d45..00000000 --- a/IfcRepresentationResource/IfcCoordinateReferenceSystem.java +++ /dev/null @@ -1,14 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcCoordinateReferenceSystem extends IfcBase - { - private string Name; - private string Description; - private string GeodeticDatum; - private string VerticalDatum; - private IfcCoordinateOperation[] HasCoordinateOperation; - } -} diff --git a/IfcRepresentationResource/IfcCoordinateReferenceSystemSelect.java b/IfcRepresentationResource/IfcCoordinateReferenceSystemSelect.java deleted file mode 100644 index 72dfb8ac..00000000 --- a/IfcRepresentationResource/IfcCoordinateReferenceSystemSelect.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public interface IfcCoordinateReferenceSystemSelect - { - } -} diff --git a/IfcRepresentationResource/IfcGeometricRepresentationContext.java b/IfcRepresentationResource/IfcGeometricRepresentationContext.java index 8c8de1d1..35337b9b 100644 --- a/IfcRepresentationResource/IfcGeometricRepresentationContext.java +++ b/IfcRepresentationResource/IfcGeometricRepresentationContext.java @@ -6,10 +6,9 @@ public class IfcGeometricRepresentationContext extends IfcRepresentationContext { private int CoordinateSpaceDimension; - private double Precision; + private REAL Precision; private IfcAxis2Placement WorldCoordinateSystem; private IfcDirection TrueNorth; private IfcGeometricRepresentationSubContext[] HasSubContexts; - private IfcCoordinateOperation[] HasCoordinateOperation; } } diff --git a/IfcRepresentationResource/IfcGeometricRepresentationSubContext.java b/IfcRepresentationResource/IfcGeometricRepresentationSubContext.java index 29031c44..35665680 100644 --- a/IfcRepresentationResource/IfcGeometricRepresentationSubContext.java +++ b/IfcRepresentationResource/IfcGeometricRepresentationSubContext.java @@ -12,6 +12,6 @@ public class IfcGeometricRepresentationSubContext extends IfcGeometricRepresenta private IfcAxis2Placement WorldCoordinateSystem; private int CoordinateSpaceDimension; private IfcDirection TrueNorth; - private double Precision; + private REAL Precision; } } diff --git a/IfcRepresentationResource/IfcMapConversion.java b/IfcRepresentationResource/IfcMapConversion.java deleted file mode 100644 index 77bab389..00000000 --- a/IfcRepresentationResource/IfcMapConversion.java +++ /dev/null @@ -1,15 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMapConversion extends IfcCoordinateOperation - { - private double Eastings; - private double Northings; - private double OrthogonalHeight; - private double XAxisAbscissa; - private double XAxisOrdinate; - private double Scale; - } -} diff --git a/IfcRepresentationResource/IfcProductRepresentationSelect.java b/IfcRepresentationResource/IfcProductRepresentationSelect.java deleted file mode 100644 index 759b3bdc..00000000 --- a/IfcRepresentationResource/IfcProductRepresentationSelect.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public interface IfcProductRepresentationSelect - { - } -} diff --git a/IfcRepresentationResource/IfcProjectedCRS.java b/IfcRepresentationResource/IfcProjectedCRS.java deleted file mode 100644 index 36528798..00000000 --- a/IfcRepresentationResource/IfcProjectedCRS.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcProjectedCRS extends IfcCoordinateReferenceSystem - { - private string MapProjection; - private string MapZone; - private IfcNamedUnit MapUnit; - } -} diff --git a/IfcRepresentationResource/IfcShapeAspect.java b/IfcRepresentationResource/IfcShapeAspect.java index dd238836..e80b5074 100644 --- a/IfcRepresentationResource/IfcShapeAspect.java +++ b/IfcRepresentationResource/IfcShapeAspect.java @@ -8,7 +8,7 @@ public class IfcShapeAspect extends IfcBase private IfcShapeModel[] ShapeRepresentations; private string Name; private string Description; - private int ProductDefinitional; - private IfcProductRepresentationSelect PartOfProductDefinitionShape; + private LOGICAL ProductDefinitional; + private IfcProductDefinitionShape PartOfProductDefinitionShape; } } diff --git a/IfcSharedBldgElements/IfcBeam.java b/IfcSharedBldgElements/IfcBeam.java index 1df92bc5..0d5f396a 100644 --- a/IfcSharedBldgElements/IfcBeam.java +++ b/IfcSharedBldgElements/IfcBeam.java @@ -5,6 +5,5 @@ { public class IfcBeam extends IfcBuildingElement { - private IfcBeamTypeEnum PredefinedType; } } diff --git a/IfcSharedBldgElements/IfcBeamStandardCase.java b/IfcSharedBldgElements/IfcBeamStandardCase.java deleted file mode 100644 index a50ef231..00000000 --- a/IfcSharedBldgElements/IfcBeamStandardCase.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcBeamStandardCase extends IfcBeam - { - } -} diff --git a/IfcSharedBldgElements/IfcBeamTypeEnum.java b/IfcSharedBldgElements/IfcBeamTypeEnum.java index ac353a38..8526effe 100644 --- a/IfcSharedBldgElements/IfcBeamTypeEnum.java +++ b/IfcSharedBldgElements/IfcBeamTypeEnum.java @@ -7,9 +7,7 @@ public enum IfcBeamTypeEnum { BEAM, JOIST, - HOLLOWCORE, LINTEL, - SPANDREL, T_BEAM, USERDEFINED, NOTDEFINED, diff --git a/IfcSharedBldgElements/IfcBuildingSystem.java b/IfcSharedBldgElements/IfcBuildingSystem.java deleted file mode 100644 index 510e2c3a..00000000 --- a/IfcSharedBldgElements/IfcBuildingSystem.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcBuildingSystem extends IfcSystem - { - private IfcBuildingSystemTypeEnum PredefinedType; - private string LongName; - } -} diff --git a/IfcSharedBldgElements/IfcBuildingSystemTypeEnum.java b/IfcSharedBldgElements/IfcBuildingSystemTypeEnum.java deleted file mode 100644 index 93158e3b..00000000 --- a/IfcSharedBldgElements/IfcBuildingSystemTypeEnum.java +++ /dev/null @@ -1,17 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcBuildingSystemTypeEnum - { - FENESTRATION, - FOUNDATION, - LOADBEARING, - OUTERSHELL, - SHADING, - TRANSPORT, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcSharedBldgElements/IfcChimney.java b/IfcSharedBldgElements/IfcChimney.java deleted file mode 100644 index a7952e6a..00000000 --- a/IfcSharedBldgElements/IfcChimney.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcChimney extends IfcBuildingElement - { - private IfcChimneyTypeEnum PredefinedType; - } -} diff --git a/IfcSharedBldgElements/IfcChimneyType.java b/IfcSharedBldgElements/IfcChimneyType.java deleted file mode 100644 index 5d74df51..00000000 --- a/IfcSharedBldgElements/IfcChimneyType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcChimneyType extends IfcBuildingElementType - { - private IfcChimneyTypeEnum PredefinedType; - } -} diff --git a/IfcSharedBldgElements/IfcChimneyTypeEnum.java b/IfcSharedBldgElements/IfcChimneyTypeEnum.java deleted file mode 100644 index 012c8627..00000000 --- a/IfcSharedBldgElements/IfcChimneyTypeEnum.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcChimneyTypeEnum - { - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcSharedBldgElements/IfcColumn.java b/IfcSharedBldgElements/IfcColumn.java index 46ceace4..1ef7bc20 100644 --- a/IfcSharedBldgElements/IfcColumn.java +++ b/IfcSharedBldgElements/IfcColumn.java @@ -5,6 +5,5 @@ { public class IfcColumn extends IfcBuildingElement { - private IfcColumnTypeEnum PredefinedType; } } diff --git a/IfcSharedBldgElements/IfcColumnStandardCase.java b/IfcSharedBldgElements/IfcColumnStandardCase.java deleted file mode 100644 index 25d04cb6..00000000 --- a/IfcSharedBldgElements/IfcColumnStandardCase.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcColumnStandardCase extends IfcColumn - { - } -} diff --git a/IfcSharedBldgElements/IfcColumnTypeEnum.java b/IfcSharedBldgElements/IfcColumnTypeEnum.java index db8b9ac1..2b1ac3ec 100644 --- a/IfcSharedBldgElements/IfcColumnTypeEnum.java +++ b/IfcSharedBldgElements/IfcColumnTypeEnum.java @@ -6,7 +6,6 @@ public enum IfcColumnTypeEnum { COLUMN, - PILASTER, USERDEFINED, NOTDEFINED, } diff --git a/IfcSharedBldgElements/IfcCurtainWall.java b/IfcSharedBldgElements/IfcCurtainWall.java index 649de723..d6a04ba4 100644 --- a/IfcSharedBldgElements/IfcCurtainWall.java +++ b/IfcSharedBldgElements/IfcCurtainWall.java @@ -5,6 +5,5 @@ { public class IfcCurtainWall extends IfcBuildingElement { - private IfcCurtainWallTypeEnum PredefinedType; } } diff --git a/IfcSharedBldgElements/IfcDoor.java b/IfcSharedBldgElements/IfcDoor.java index 2f24c1db..c142664a 100644 --- a/IfcSharedBldgElements/IfcDoor.java +++ b/IfcSharedBldgElements/IfcDoor.java @@ -7,8 +7,5 @@ public class IfcDoor extends IfcBuildingElement { private IfcLengthMeasure OverallHeight; private IfcLengthMeasure OverallWidth; - private IfcDoorTypeEnum PredefinedType; - private IfcDoorTypeOperationEnum OperationType; - private string UserDefinedOperationType; } } diff --git a/IfcArchitectureDomain/IfcDoorLiningProperties.java b/IfcSharedBldgElements/IfcDoorLiningProperties.java similarity index 81% rename from IfcArchitectureDomain/IfcDoorLiningProperties.java rename to IfcSharedBldgElements/IfcDoorLiningProperties.java index 283b252a..167cfdba 100644 --- a/IfcArchitectureDomain/IfcDoorLiningProperties.java +++ b/IfcSharedBldgElements/IfcDoorLiningProperties.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcDoorLiningProperties extends IfcPreDefinedPropertySet + public class IfcDoorLiningProperties extends IfcPropertySetDefinition { private IfcLengthMeasure LiningDepth; private IfcLengthMeasure LiningThickness; @@ -16,7 +16,5 @@ public class IfcDoorLiningProperties extends IfcPreDefinedPropertySet private IfcLengthMeasure CasingThickness; private IfcLengthMeasure CasingDepth; private IfcShapeAspect ShapeAspectStyle; - private double LiningToPanelOffsetX; - private double LiningToPanelOffsetY; } } diff --git a/IfcArchitectureDomain/IfcDoorPanelOperationEnum.java b/IfcSharedBldgElements/IfcDoorPanelOperationEnum.java similarity index 96% rename from IfcArchitectureDomain/IfcDoorPanelOperationEnum.java rename to IfcSharedBldgElements/IfcDoorPanelOperationEnum.java index 214fd2c8..6c0232ab 100644 --- a/IfcArchitectureDomain/IfcDoorPanelOperationEnum.java +++ b/IfcSharedBldgElements/IfcDoorPanelOperationEnum.java @@ -11,7 +11,6 @@ public enum IfcDoorPanelOperationEnum FOLDING, REVOLVING, ROLLINGUP, - FIXEDPANEL, USERDEFINED, NOTDEFINED, } diff --git a/IfcArchitectureDomain/IfcDoorPanelPositionEnum.java b/IfcSharedBldgElements/IfcDoorPanelPositionEnum.java similarity index 100% rename from IfcArchitectureDomain/IfcDoorPanelPositionEnum.java rename to IfcSharedBldgElements/IfcDoorPanelPositionEnum.java diff --git a/IfcArchitectureDomain/IfcDoorPanelProperties.java b/IfcSharedBldgElements/IfcDoorPanelProperties.java similarity index 85% rename from IfcArchitectureDomain/IfcDoorPanelProperties.java rename to IfcSharedBldgElements/IfcDoorPanelProperties.java index 8074276a..6b21826f 100644 --- a/IfcArchitectureDomain/IfcDoorPanelProperties.java +++ b/IfcSharedBldgElements/IfcDoorPanelProperties.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcDoorPanelProperties extends IfcPreDefinedPropertySet + public class IfcDoorPanelProperties extends IfcPropertySetDefinition { private IfcLengthMeasure PanelDepth; private IfcDoorPanelOperationEnum PanelOperation; diff --git a/IfcSharedBldgElements/IfcDoorStandardCase.java b/IfcSharedBldgElements/IfcDoorStandardCase.java deleted file mode 100644 index 5b02ff3a..00000000 --- a/IfcSharedBldgElements/IfcDoorStandardCase.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcDoorStandardCase extends IfcDoor - { - } -} diff --git a/IfcArchitectureDomain/IfcDoorStyle.java b/IfcSharedBldgElements/IfcDoorStyle.java similarity index 83% rename from IfcArchitectureDomain/IfcDoorStyle.java rename to IfcSharedBldgElements/IfcDoorStyle.java index 161597a1..7a30b13d 100644 --- a/IfcArchitectureDomain/IfcDoorStyle.java +++ b/IfcSharedBldgElements/IfcDoorStyle.java @@ -7,7 +7,7 @@ public class IfcDoorStyle extends IfcTypeProduct { private IfcDoorStyleOperationEnum OperationType; private IfcDoorStyleConstructionEnum ConstructionType; - private bool ParameterTakesPrecedence; - private bool Sizeable; + private BOOLEAN ParameterTakesPrecedence; + private BOOLEAN Sizeable; } } diff --git a/IfcArchitectureDomain/IfcDoorStyleConstructionEnum.java b/IfcSharedBldgElements/IfcDoorStyleConstructionEnum.java similarity index 100% rename from IfcArchitectureDomain/IfcDoorStyleConstructionEnum.java rename to IfcSharedBldgElements/IfcDoorStyleConstructionEnum.java diff --git a/IfcArchitectureDomain/IfcDoorStyleOperationEnum.java b/IfcSharedBldgElements/IfcDoorStyleOperationEnum.java similarity index 100% rename from IfcArchitectureDomain/IfcDoorStyleOperationEnum.java rename to IfcSharedBldgElements/IfcDoorStyleOperationEnum.java diff --git a/IfcSharedBldgElements/IfcDoorType.java b/IfcSharedBldgElements/IfcDoorType.java deleted file mode 100644 index e3d748ee..00000000 --- a/IfcSharedBldgElements/IfcDoorType.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcDoorType extends IfcBuildingElementType - { - private IfcDoorTypeEnum PredefinedType; - private IfcDoorTypeOperationEnum OperationType; - private bool ParameterTakesPrecedence; - private string UserDefinedOperationType; - } -} diff --git a/IfcSharedBldgElements/IfcDoorTypeEnum.java b/IfcSharedBldgElements/IfcDoorTypeEnum.java deleted file mode 100644 index 855068ff..00000000 --- a/IfcSharedBldgElements/IfcDoorTypeEnum.java +++ /dev/null @@ -1,14 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcDoorTypeEnum - { - DOOR, - GATE, - TRAPDOOR, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcSharedBldgElements/IfcDoorTypeOperationEnum.java b/IfcSharedBldgElements/IfcDoorTypeOperationEnum.java deleted file mode 100644 index d925ae74..00000000 --- a/IfcSharedBldgElements/IfcDoorTypeOperationEnum.java +++ /dev/null @@ -1,29 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcDoorTypeOperationEnum - { - SINGLE_SWING_LEFT, - SINGLE_SWING_RIGHT, - DOUBLE_DOOR_SINGLE_SWING, - DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_LEFT, - DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_RIGHT, - DOUBLE_SWING_LEFT, - DOUBLE_SWING_RIGHT, - DOUBLE_DOOR_DOUBLE_SWING, - SLIDING_TO_LEFT, - SLIDING_TO_RIGHT, - DOUBLE_DOOR_SLIDING, - FOLDING_TO_LEFT, - FOLDING_TO_RIGHT, - DOUBLE_DOOR_FOLDING, - REVOLVING, - ROLLINGUP, - SWING_FIXED_LEFT, - SWING_FIXED_RIGHT, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcSharedBldgElements/IfcMember.java b/IfcSharedBldgElements/IfcMember.java index 8b7dd23e..4ad34edc 100644 --- a/IfcSharedBldgElements/IfcMember.java +++ b/IfcSharedBldgElements/IfcMember.java @@ -5,6 +5,5 @@ { public class IfcMember extends IfcBuildingElement { - private IfcMemberTypeEnum PredefinedType; } } diff --git a/IfcSharedBldgElements/IfcMemberStandardCase.java b/IfcSharedBldgElements/IfcMemberStandardCase.java deleted file mode 100644 index ee0f2471..00000000 --- a/IfcSharedBldgElements/IfcMemberStandardCase.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcMemberStandardCase extends IfcMember - { - } -} diff --git a/IfcSharedBldgElements/IfcPlate.java b/IfcSharedBldgElements/IfcPlate.java index e29044de..d73fe9f3 100644 --- a/IfcSharedBldgElements/IfcPlate.java +++ b/IfcSharedBldgElements/IfcPlate.java @@ -5,6 +5,5 @@ { public class IfcPlate extends IfcBuildingElement { - private IfcPlateTypeEnum PredefinedType; } } diff --git a/IfcSharedBldgElements/IfcPlateStandardCase.java b/IfcSharedBldgElements/IfcPlateStandardCase.java deleted file mode 100644 index 5aa25fae..00000000 --- a/IfcSharedBldgElements/IfcPlateStandardCase.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcPlateStandardCase extends IfcPlate - { - } -} diff --git a/IfcSharedBldgElements/IfcRamp.java b/IfcSharedBldgElements/IfcRamp.java index 44562976..2e5bd27f 100644 --- a/IfcSharedBldgElements/IfcRamp.java +++ b/IfcSharedBldgElements/IfcRamp.java @@ -5,6 +5,6 @@ { public class IfcRamp extends IfcBuildingElement { - private IfcRampTypeEnum PredefinedType; + private IfcRampTypeEnum ShapeType; } } diff --git a/IfcSharedBldgElements/IfcRampFlight.java b/IfcSharedBldgElements/IfcRampFlight.java index dd6c8441..9d1e5a52 100644 --- a/IfcSharedBldgElements/IfcRampFlight.java +++ b/IfcSharedBldgElements/IfcRampFlight.java @@ -5,6 +5,5 @@ { public class IfcRampFlight extends IfcBuildingElement { - private IfcRampFlightTypeEnum PredefinedType; } } diff --git a/IfcSharedBldgElements/IfcRampType.java b/IfcSharedBldgElements/IfcRampType.java deleted file mode 100644 index 9ec86d3f..00000000 --- a/IfcSharedBldgElements/IfcRampType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcRampType extends IfcBuildingElementType - { - private IfcRampTypeEnum PredefinedType; - } -} diff --git a/IfcSharedBldgElements/IfcRelConnectsPathElements.java b/IfcSharedBldgElements/IfcRelConnectsPathElements.java index 41cff1af..b21b9de4 100644 --- a/IfcSharedBldgElements/IfcRelConnectsPathElements.java +++ b/IfcSharedBldgElements/IfcRelConnectsPathElements.java @@ -5,8 +5,8 @@ { public class IfcRelConnectsPathElements extends IfcRelConnectsElements { - private int[] RelatingPriorities; - private int[] RelatedPriorities; + private INTEGER[] RelatingPriorities; + private INTEGER[] RelatedPriorities; private IfcConnectionTypeEnum RelatedConnectionType; private IfcConnectionTypeEnum RelatingConnectionType; } diff --git a/IfcSharedBldgElements/IfcRoof.java b/IfcSharedBldgElements/IfcRoof.java index 0876683f..dc4a211b 100644 --- a/IfcSharedBldgElements/IfcRoof.java +++ b/IfcSharedBldgElements/IfcRoof.java @@ -5,6 +5,6 @@ { public class IfcRoof extends IfcBuildingElement { - private IfcRoofTypeEnum PredefinedType; + private IfcRoofTypeEnum ShapeType; } } diff --git a/IfcSharedBldgElements/IfcRoofType.java b/IfcSharedBldgElements/IfcRoofType.java deleted file mode 100644 index c3c1ae8e..00000000 --- a/IfcSharedBldgElements/IfcRoofType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcRoofType extends IfcBuildingElementType - { - private IfcRoofTypeEnum PredefinedType; - } -} diff --git a/IfcSharedBldgElements/IfcRoofTypeEnum.java b/IfcSharedBldgElements/IfcRoofTypeEnum.java index cb748fb3..0198ce2a 100644 --- a/IfcSharedBldgElements/IfcRoofTypeEnum.java +++ b/IfcSharedBldgElements/IfcRoofTypeEnum.java @@ -18,7 +18,6 @@ public enum IfcRoofTypeEnum PAVILION_ROOF, DOME_ROOF, FREEFORM, - USERDEFINED, NOTDEFINED, } } diff --git a/IfcSharedBldgElements/IfcShadingDevice.java b/IfcSharedBldgElements/IfcShadingDevice.java deleted file mode 100644 index 94990e77..00000000 --- a/IfcSharedBldgElements/IfcShadingDevice.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcShadingDevice extends IfcBuildingElement - { - private IfcShadingDeviceTypeEnum PredefinedType; - } -} diff --git a/IfcSharedBldgElements/IfcShadingDeviceType.java b/IfcSharedBldgElements/IfcShadingDeviceType.java deleted file mode 100644 index 3de1e40b..00000000 --- a/IfcSharedBldgElements/IfcShadingDeviceType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcShadingDeviceType extends IfcBuildingElementType - { - private IfcShadingDeviceTypeEnum PredefinedType; - } -} diff --git a/IfcSharedBldgElements/IfcShadingDeviceTypeEnum.java b/IfcSharedBldgElements/IfcShadingDeviceTypeEnum.java deleted file mode 100644 index 0216db2a..00000000 --- a/IfcSharedBldgElements/IfcShadingDeviceTypeEnum.java +++ /dev/null @@ -1,14 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcShadingDeviceTypeEnum - { - JALOUSIE, - SHUTTER, - AWNING, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcSharedBldgElements/IfcSlabElementedCase.java b/IfcSharedBldgElements/IfcSlabElementedCase.java deleted file mode 100644 index 8191a0cf..00000000 --- a/IfcSharedBldgElements/IfcSlabElementedCase.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSlabElementedCase extends IfcSlab - { - } -} diff --git a/IfcSharedBldgElements/IfcSlabStandardCase.java b/IfcSharedBldgElements/IfcSlabStandardCase.java deleted file mode 100644 index 2c06c5b4..00000000 --- a/IfcSharedBldgElements/IfcSlabStandardCase.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSlabStandardCase extends IfcSlab - { - } -} diff --git a/IfcSharedBldgElements/IfcStair.java b/IfcSharedBldgElements/IfcStair.java index 68dd2cbd..79852df8 100644 --- a/IfcSharedBldgElements/IfcStair.java +++ b/IfcSharedBldgElements/IfcStair.java @@ -5,6 +5,6 @@ { public class IfcStair extends IfcBuildingElement { - private IfcStairTypeEnum PredefinedType; + private IfcStairTypeEnum ShapeType; } } diff --git a/IfcSharedBldgElements/IfcStairFlight.java b/IfcSharedBldgElements/IfcStairFlight.java index 7cc47e10..4e30da4a 100644 --- a/IfcSharedBldgElements/IfcStairFlight.java +++ b/IfcSharedBldgElements/IfcStairFlight.java @@ -5,10 +5,9 @@ { public class IfcStairFlight extends IfcBuildingElement { - private int NumberOfRisers; - private int NumberOfTreads; + private INTEGER NumberOfRiser; + private INTEGER NumberOfTreads; private IfcLengthMeasure RiserHeight; private IfcLengthMeasure TreadLength; - private IfcStairFlightTypeEnum PredefinedType; } } diff --git a/IfcSharedBldgElements/IfcStairType.java b/IfcSharedBldgElements/IfcStairType.java deleted file mode 100644 index 1d32968f..00000000 --- a/IfcSharedBldgElements/IfcStairType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcStairType extends IfcBuildingElementType - { - private IfcStairTypeEnum PredefinedType; - } -} diff --git a/IfcSharedBldgElements/IfcWall.java b/IfcSharedBldgElements/IfcWall.java index 2497fea0..91eedfe9 100644 --- a/IfcSharedBldgElements/IfcWall.java +++ b/IfcSharedBldgElements/IfcWall.java @@ -5,6 +5,5 @@ { public class IfcWall extends IfcBuildingElement { - private IfcWallTypeEnum PredefinedType; } } diff --git a/IfcSharedBldgElements/IfcWallElementedCase.java b/IfcSharedBldgElements/IfcWallElementedCase.java deleted file mode 100644 index 80817651..00000000 --- a/IfcSharedBldgElements/IfcWallElementedCase.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcWallElementedCase extends IfcWall - { - } -} diff --git a/IfcSharedBldgElements/IfcWallTypeEnum.java b/IfcSharedBldgElements/IfcWallTypeEnum.java index 121b6bed..95e54127 100644 --- a/IfcSharedBldgElements/IfcWallTypeEnum.java +++ b/IfcSharedBldgElements/IfcWallTypeEnum.java @@ -5,15 +5,11 @@ { public enum IfcWallTypeEnum { - MOVABLE, - PARAPET, - PARTITIONING, - PLUMBINGWALL, - SHEAR, - SOLIDWALL, STANDARD, POLYGONAL, + SHEAR, ELEMENTEDWALL, + PLUMBINGWALL, USERDEFINED, NOTDEFINED, } diff --git a/IfcSharedBldgElements/IfcWindow.java b/IfcSharedBldgElements/IfcWindow.java index f41f93e0..1b31852d 100644 --- a/IfcSharedBldgElements/IfcWindow.java +++ b/IfcSharedBldgElements/IfcWindow.java @@ -7,8 +7,5 @@ public class IfcWindow extends IfcBuildingElement { private IfcLengthMeasure OverallHeight; private IfcLengthMeasure OverallWidth; - private IfcWindowTypeEnum PredefinedType; - private IfcWindowTypePartitioningEnum PartitioningType; - private string UserDefinedPartitioningType; } } diff --git a/IfcArchitectureDomain/IfcWindowLiningProperties.java b/IfcSharedBldgElements/IfcWindowLiningProperties.java similarity index 76% rename from IfcArchitectureDomain/IfcWindowLiningProperties.java rename to IfcSharedBldgElements/IfcWindowLiningProperties.java index 8b0b20a4..080cd232 100644 --- a/IfcArchitectureDomain/IfcWindowLiningProperties.java +++ b/IfcSharedBldgElements/IfcWindowLiningProperties.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcWindowLiningProperties extends IfcPreDefinedPropertySet + public class IfcWindowLiningProperties extends IfcPropertySetDefinition { private IfcLengthMeasure LiningDepth; private IfcLengthMeasure LiningThickness; @@ -14,8 +14,5 @@ public class IfcWindowLiningProperties extends IfcPreDefinedPropertySet private IfcRatioMeasure FirstMullionOffset; private IfcRatioMeasure SecondMullionOffset; private IfcShapeAspect ShapeAspectStyle; - private double LiningOffset; - private double LiningToPanelOffsetX; - private double LiningToPanelOffsetY; } } diff --git a/IfcArchitectureDomain/IfcWindowPanelOperationEnum.java b/IfcSharedBldgElements/IfcWindowPanelOperationEnum.java similarity index 100% rename from IfcArchitectureDomain/IfcWindowPanelOperationEnum.java rename to IfcSharedBldgElements/IfcWindowPanelOperationEnum.java diff --git a/IfcArchitectureDomain/IfcWindowPanelPositionEnum.java b/IfcSharedBldgElements/IfcWindowPanelPositionEnum.java similarity index 100% rename from IfcArchitectureDomain/IfcWindowPanelPositionEnum.java rename to IfcSharedBldgElements/IfcWindowPanelPositionEnum.java diff --git a/IfcArchitectureDomain/IfcWindowPanelProperties.java b/IfcSharedBldgElements/IfcWindowPanelProperties.java similarity index 85% rename from IfcArchitectureDomain/IfcWindowPanelProperties.java rename to IfcSharedBldgElements/IfcWindowPanelProperties.java index 7bf64636..27a56e93 100644 --- a/IfcArchitectureDomain/IfcWindowPanelProperties.java +++ b/IfcSharedBldgElements/IfcWindowPanelProperties.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcWindowPanelProperties extends IfcPreDefinedPropertySet + public class IfcWindowPanelProperties extends IfcPropertySetDefinition { private IfcWindowPanelOperationEnum OperationType; private IfcWindowPanelPositionEnum PanelPosition; diff --git a/IfcSharedBldgElements/IfcWindowStandardCase.java b/IfcSharedBldgElements/IfcWindowStandardCase.java deleted file mode 100644 index 1c857339..00000000 --- a/IfcSharedBldgElements/IfcWindowStandardCase.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcWindowStandardCase extends IfcWindow - { - } -} diff --git a/IfcArchitectureDomain/IfcWindowStyle.java b/IfcSharedBldgElements/IfcWindowStyle.java similarity index 83% rename from IfcArchitectureDomain/IfcWindowStyle.java rename to IfcSharedBldgElements/IfcWindowStyle.java index 70601429..e3efc5f9 100644 --- a/IfcArchitectureDomain/IfcWindowStyle.java +++ b/IfcSharedBldgElements/IfcWindowStyle.java @@ -7,7 +7,7 @@ public class IfcWindowStyle extends IfcTypeProduct { private IfcWindowStyleConstructionEnum ConstructionType; private IfcWindowStyleOperationEnum OperationType; - private bool ParameterTakesPrecedence; - private bool Sizeable; + private BOOLEAN ParameterTakesPrecedence; + private BOOLEAN Sizeable; } } diff --git a/IfcArchitectureDomain/IfcWindowStyleConstructionEnum.java b/IfcSharedBldgElements/IfcWindowStyleConstructionEnum.java similarity index 100% rename from IfcArchitectureDomain/IfcWindowStyleConstructionEnum.java rename to IfcSharedBldgElements/IfcWindowStyleConstructionEnum.java diff --git a/IfcArchitectureDomain/IfcWindowStyleOperationEnum.java b/IfcSharedBldgElements/IfcWindowStyleOperationEnum.java similarity index 100% rename from IfcArchitectureDomain/IfcWindowStyleOperationEnum.java rename to IfcSharedBldgElements/IfcWindowStyleOperationEnum.java diff --git a/IfcSharedBldgElements/IfcWindowType.java b/IfcSharedBldgElements/IfcWindowType.java deleted file mode 100644 index e7f2bbbf..00000000 --- a/IfcSharedBldgElements/IfcWindowType.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcWindowType extends IfcBuildingElementType - { - private IfcWindowTypeEnum PredefinedType; - private IfcWindowTypePartitioningEnum PartitioningType; - private bool ParameterTakesPrecedence; - private string UserDefinedPartitioningType; - } -} diff --git a/IfcSharedBldgElements/IfcWindowTypeEnum.java b/IfcSharedBldgElements/IfcWindowTypeEnum.java deleted file mode 100644 index c4f97bc3..00000000 --- a/IfcSharedBldgElements/IfcWindowTypeEnum.java +++ /dev/null @@ -1,14 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcWindowTypeEnum - { - WINDOW, - SKYLIGHT, - LIGHTDOME, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcSharedBldgElements/IfcWindowTypePartitioningEnum.java b/IfcSharedBldgElements/IfcWindowTypePartitioningEnum.java deleted file mode 100644 index e5913b50..00000000 --- a/IfcSharedBldgElements/IfcWindowTypePartitioningEnum.java +++ /dev/null @@ -1,20 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcWindowTypePartitioningEnum - { - SINGLE_PANEL, - DOUBLE_PANEL_VERTICAL, - DOUBLE_PANEL_HORIZONTAL, - TRIPLE_PANEL_VERTICAL, - TRIPLE_PANEL_BOTTOM, - TRIPLE_PANEL_TOP, - TRIPLE_PANEL_LEFT, - TRIPLE_PANEL_RIGHT, - TRIPLE_PANEL_HORIZONTAL, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcSharedBldgServiceElements/IfcDistributionChamberElement.java b/IfcSharedBldgServiceElements/IfcDistributionChamberElement.java index 66d97532..b2d2a9b3 100644 --- a/IfcSharedBldgServiceElements/IfcDistributionChamberElement.java +++ b/IfcSharedBldgServiceElements/IfcDistributionChamberElement.java @@ -5,6 +5,5 @@ { public class IfcDistributionChamberElement extends IfcDistributionFlowElement { - private IfcDistributionChamberElementTypeEnum PredefinedType; } } diff --git a/IfcSharedBldgServiceElements/IfcDistributionCircuit.java b/IfcSharedBldgServiceElements/IfcDistributionCircuit.java deleted file mode 100644 index e9948f23..00000000 --- a/IfcSharedBldgServiceElements/IfcDistributionCircuit.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcDistributionCircuit extends IfcDistributionSystem - { - } -} diff --git a/IfcSharedBldgServiceElements/IfcDistributionControlElement.java b/IfcSharedBldgServiceElements/IfcDistributionControlElement.java index 8fe4e8c7..924a77f0 100644 --- a/IfcSharedBldgServiceElements/IfcDistributionControlElement.java +++ b/IfcSharedBldgServiceElements/IfcDistributionControlElement.java @@ -5,6 +5,7 @@ { public class IfcDistributionControlElement extends IfcDistributionElement { + private string ControlElementId; private IfcRelFlowControlElements[] AssignedToFlowElement; } } diff --git a/IfcSharedBldgServiceElements/IfcDistributionPort.java b/IfcSharedBldgServiceElements/IfcDistributionPort.java index 4181402a..e42669e9 100644 --- a/IfcSharedBldgServiceElements/IfcDistributionPort.java +++ b/IfcSharedBldgServiceElements/IfcDistributionPort.java @@ -6,7 +6,5 @@ public class IfcDistributionPort extends IfcPort { private IfcFlowDirectionEnum FlowDirection; - private IfcDistributionPortTypeEnum PredefinedType; - private IfcDistributionSystemEnum SystemType; } } diff --git a/IfcSharedBldgServiceElements/IfcDistributionPortTypeEnum.java b/IfcSharedBldgServiceElements/IfcDistributionPortTypeEnum.java deleted file mode 100644 index 72796b64..00000000 --- a/IfcSharedBldgServiceElements/IfcDistributionPortTypeEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcDistributionPortTypeEnum - { - CABLE, - CABLECARRIER, - DUCT, - PIPE, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcSharedBldgServiceElements/IfcDistributionSystem.java b/IfcSharedBldgServiceElements/IfcDistributionSystem.java deleted file mode 100644 index 6329a91b..00000000 --- a/IfcSharedBldgServiceElements/IfcDistributionSystem.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcDistributionSystem extends IfcSystem - { - private string LongName; - private IfcDistributionSystemEnum PredefinedType; - } -} diff --git a/IfcSharedBldgServiceElements/IfcDistributionSystemEnum.java b/IfcSharedBldgServiceElements/IfcDistributionSystemEnum.java deleted file mode 100644 index bf943462..00000000 --- a/IfcSharedBldgServiceElements/IfcDistributionSystemEnum.java +++ /dev/null @@ -1,53 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcDistributionSystemEnum - { - AIRCONDITIONING, - AUDIOVISUAL, - CHEMICAL, - CHILLEDWATER, - COMMUNICATION, - COMPRESSEDAIR, - CONDENSERWATER, - CONTROL, - CONVEYING, - DATA, - DISPOSAL, - DOMESTICCOLDWATER, - DOMESTICHOTWATER, - DRAINAGE, - EARTHING, - ELECTRICAL, - ELECTROACOUSTIC, - EXHAUST, - FIREPROTECTION, - FUEL, - GAS, - HAZARDOUS, - HEATING, - LIGHTING, - LIGHTNINGPROTECTION, - MUNICIPALSOLIDWASTE, - OIL, - OPERATIONAL, - POWERGENERATION, - RAINWATER, - REFRIGERATION, - SECURITY, - SEWAGE, - SIGNAL, - STORMWATER, - TELEPHONE, - TV, - VACUUM, - VENT, - VENTILATION, - WASTEWATER, - WATERSUPPLY, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcHvacDomain/IfcBurnerTypeEnum.java b/IfcSharedBldgServiceElements/IfcElectricCurrentEnum.java similarity index 77% rename from IfcHvacDomain/IfcBurnerTypeEnum.java rename to IfcSharedBldgServiceElements/IfcElectricCurrentEnum.java index c44f96b3..b04f08f9 100644 --- a/IfcHvacDomain/IfcBurnerTypeEnum.java +++ b/IfcSharedBldgServiceElements/IfcElectricCurrentEnum.java @@ -3,9 +3,10 @@ package buildingsmart.ifc { - public enum IfcBurnerTypeEnum + public enum IfcElectricCurrentEnum { - USERDEFINED, + ALTERNATING, + DIRECT, NOTDEFINED, } } diff --git a/IfcSharedBldgServiceElements/IfcElectricalBaseProperties.java b/IfcSharedBldgServiceElements/IfcElectricalBaseProperties.java new file mode 100644 index 00000000..5ab1bdf4 --- /dev/null +++ b/IfcSharedBldgServiceElements/IfcElectricalBaseProperties.java @@ -0,0 +1,17 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcElectricalBaseProperties extends IfcEnergyProperties + { + private IfcElectricCurrentEnum ElectricCurrentType; + private double InputVoltage; + private double InputFrequency; + private double FullLoadCurrent; + private double MinimumCircuitCurrent; + private double MaximumPowerInput; + private double RatedPowerInput; + private INTEGER InputPhase; + } +} diff --git a/IfcSharedBldgServiceElements/IfcEnergyProperties.java b/IfcSharedBldgServiceElements/IfcEnergyProperties.java new file mode 100644 index 00000000..c708d550 --- /dev/null +++ b/IfcSharedBldgServiceElements/IfcEnergyProperties.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcEnergyProperties extends IfcPropertySetDefinition + { + private IfcEnergySequenceEnum EnergySequence; + private string UserDefinedEnergySequence; + } +} diff --git a/IfcSharedBldgServiceElements/IfcEnergySequenceEnum.java b/IfcSharedBldgServiceElements/IfcEnergySequenceEnum.java new file mode 100644 index 00000000..d5976a29 --- /dev/null +++ b/IfcSharedBldgServiceElements/IfcEnergySequenceEnum.java @@ -0,0 +1,15 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public enum IfcEnergySequenceEnum + { + PRIMARY, + SECONDARY, + TERTIARY, + AUXILIARY, + USERDEFINED, + NOTDEFINED, + } +} diff --git a/IfcSharedBldgServiceElements/IfcFluidFlowProperties.java b/IfcSharedBldgServiceElements/IfcFluidFlowProperties.java new file mode 100644 index 00000000..a23bdeff --- /dev/null +++ b/IfcSharedBldgServiceElements/IfcFluidFlowProperties.java @@ -0,0 +1,24 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcFluidFlowProperties extends IfcPropertySetDefinition + { + private IfcPropertySourceEnum PropertySource; + private IfcTimeSeries FlowConditionTimeSeries; + private IfcTimeSeries VelocityTimeSeries; + private IfcTimeSeries FlowrateTimeSeries; + private IfcMaterial Fluid; + private IfcTimeSeries PressureTimeSeries; + private string UserDefinedPropertySource; + private double TemperatureSingleValue; + private double WetBulbTemperatureSingleValue; + private IfcTimeSeries WetBulbTemperatureTimeSeries; + private IfcTimeSeries TemperatureTimeSeries; + private IfcDerivedMeasureValue FlowrateSingleValue; + private IfcRatioMeasure FlowConditionSingleValue; + private double VelocitySingleValue; + private double PressureSingleValue; + } +} diff --git a/IfcSharedBldgServiceElements/IfcPropertySourceEnum.java b/IfcSharedBldgServiceElements/IfcPropertySourceEnum.java new file mode 100644 index 00000000..84664608 --- /dev/null +++ b/IfcSharedBldgServiceElements/IfcPropertySourceEnum.java @@ -0,0 +1,18 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public enum IfcPropertySourceEnum + { + DESIGN, + DESIGNMAXIMUM, + DESIGNMINIMUM, + SIMULATED, + ASBUILT, + COMMISSIONING, + MEASURED, + USERDEFINED, + NOTKNOWN, + } +} diff --git a/IfcSharedBldgServiceElements/IfcSoundProperties.java b/IfcSharedBldgServiceElements/IfcSoundProperties.java new file mode 100644 index 00000000..3ca870d7 --- /dev/null +++ b/IfcSharedBldgServiceElements/IfcSoundProperties.java @@ -0,0 +1,12 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcSoundProperties extends IfcPropertySetDefinition + { + private bool IsAttenuating; + private IfcSoundScaleEnum SoundScale; + private IfcSoundValue[] SoundValues; + } +} diff --git a/IfcConstructionMgmtDomain/IfcSubContractResourceTypeEnum.java b/IfcSharedBldgServiceElements/IfcSoundScaleEnum.java similarity index 77% rename from IfcConstructionMgmtDomain/IfcSubContractResourceTypeEnum.java rename to IfcSharedBldgServiceElements/IfcSoundScaleEnum.java index fa694523..7403c149 100644 --- a/IfcConstructionMgmtDomain/IfcSubContractResourceTypeEnum.java +++ b/IfcSharedBldgServiceElements/IfcSoundScaleEnum.java @@ -3,10 +3,13 @@ package buildingsmart.ifc { - public enum IfcSubContractResourceTypeEnum + public enum IfcSoundScaleEnum { - PURCHASE, - WORK, + DBA, + DBB, + DBC, + NC, + NR, USERDEFINED, NOTDEFINED, } diff --git a/IfcSharedBldgServiceElements/IfcSoundValue.java b/IfcSharedBldgServiceElements/IfcSoundValue.java new file mode 100644 index 00000000..ba291cde --- /dev/null +++ b/IfcSharedBldgServiceElements/IfcSoundValue.java @@ -0,0 +1,12 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcSoundValue extends IfcPropertySetDefinition + { + private IfcTimeSeries SoundLevelTimeSeries; + private double Frequency; + private IfcDerivedMeasureValue SoundLevelSingleValue; + } +} diff --git a/IfcSharedBldgServiceElements/IfcSpaceThermalLoadProperties.java b/IfcSharedBldgServiceElements/IfcSpaceThermalLoadProperties.java new file mode 100644 index 00000000..7126b215 --- /dev/null +++ b/IfcSharedBldgServiceElements/IfcSpaceThermalLoadProperties.java @@ -0,0 +1,19 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcSpaceThermalLoadProperties extends IfcPropertySetDefinition + { + private IfcRatioMeasure ApplicableValueRatio; + private IfcThermalLoadSourceEnum ThermalLoadSource; + private IfcPropertySourceEnum PropertySource; + private string SourceDescription; + private double MaximumValue; + private double MinimumValue; + private IfcTimeSeries ThermalLoadTimeSeriesValues; + private string UserDefinedThermalLoadSource; + private string UserDefinedPropertySource; + private IfcThermalLoadTypeEnum ThermalLoadType; + } +} diff --git a/IfcProductExtension/IfcSpatialZoneTypeEnum.java b/IfcSharedBldgServiceElements/IfcThermalLoadSourceEnum.java similarity index 51% rename from IfcProductExtension/IfcSpatialZoneTypeEnum.java rename to IfcSharedBldgServiceElements/IfcThermalLoadSourceEnum.java index 2b734691..41a6ad21 100644 --- a/IfcProductExtension/IfcSpatialZoneTypeEnum.java +++ b/IfcSharedBldgServiceElements/IfcThermalLoadSourceEnum.java @@ -3,16 +3,19 @@ package buildingsmart.ifc { - public enum IfcSpatialZoneTypeEnum + public enum IfcThermalLoadSourceEnum { - CONSTRUCTION, - FIRESAFETY, + PEOPLE, LIGHTING, - OCCUPANCY, - SECURITY, - THERMAL, - TRANSPORT, - VENTILATION, + EQUIPMENT, + VENTILATIONINDOORAIR, + VENTILATIONOUTSIDEAIR, + RECIRCULATEDAIR, + EXHAUSTAIR, + AIREXCHANGERATE, + DRYBULBTEMPERATURE, + RELATIVEHUMIDITY, + INFILTRATION, USERDEFINED, NOTDEFINED, } diff --git a/IfcProductExtension/IfcGeographicElementTypeEnum.java b/IfcSharedBldgServiceElements/IfcThermalLoadTypeEnum.java similarity index 75% rename from IfcProductExtension/IfcGeographicElementTypeEnum.java rename to IfcSharedBldgServiceElements/IfcThermalLoadTypeEnum.java index 7e07bad2..82e043bc 100644 --- a/IfcProductExtension/IfcGeographicElementTypeEnum.java +++ b/IfcSharedBldgServiceElements/IfcThermalLoadTypeEnum.java @@ -3,10 +3,11 @@ package buildingsmart.ifc { - public enum IfcGeographicElementTypeEnum + public enum IfcThermalLoadTypeEnum { - TERRAIN, - USERDEFINED, + SENSIBLE, + LATENT, + RADIANT, NOTDEFINED, } } diff --git a/IfcSharedComponentElements/IfcBuildingElementPart.java b/IfcSharedComponentElements/IfcBuildingElementPart.java deleted file mode 100644 index 74384997..00000000 --- a/IfcSharedComponentElements/IfcBuildingElementPart.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcBuildingElementPart extends IfcElementComponent - { - private IfcBuildingElementPartTypeEnum PredefinedType; - } -} diff --git a/IfcSharedComponentElements/IfcBuildingElementPartType.java b/IfcSharedComponentElements/IfcBuildingElementPartType.java deleted file mode 100644 index 24621dfd..00000000 --- a/IfcSharedComponentElements/IfcBuildingElementPartType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcBuildingElementPartType extends IfcElementComponentType - { - private IfcBuildingElementPartTypeEnum PredefinedType; - } -} diff --git a/IfcSharedComponentElements/IfcBuildingElementPartTypeEnum.java b/IfcSharedComponentElements/IfcBuildingElementPartTypeEnum.java deleted file mode 100644 index b4bcfeb2..00000000 --- a/IfcSharedComponentElements/IfcBuildingElementPartTypeEnum.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcBuildingElementPartTypeEnum - { - INSULATION, - PRECASTPANEL, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcSharedComponentElements/IfcChamferEdgeFeature.java b/IfcSharedComponentElements/IfcChamferEdgeFeature.java new file mode 100644 index 00000000..5a2a1460 --- /dev/null +++ b/IfcSharedComponentElements/IfcChamferEdgeFeature.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcChamferEdgeFeature extends IfcEdgeFeature + { + private IfcLengthMeasure Width; + private IfcLengthMeasure Height; + } +} diff --git a/IfcSharedComponentElements/IfcDiscreteAccessory.java b/IfcSharedComponentElements/IfcDiscreteAccessory.java index 252db4bf..c0495c0c 100644 --- a/IfcSharedComponentElements/IfcDiscreteAccessory.java +++ b/IfcSharedComponentElements/IfcDiscreteAccessory.java @@ -5,6 +5,5 @@ { public class IfcDiscreteAccessory extends IfcElementComponent { - private IfcDiscreteAccessoryTypeEnum PredefinedType; } } diff --git a/IfcSharedComponentElements/IfcDiscreteAccessoryType.java b/IfcSharedComponentElements/IfcDiscreteAccessoryType.java index 76e1ed7e..01c14800 100644 --- a/IfcSharedComponentElements/IfcDiscreteAccessoryType.java +++ b/IfcSharedComponentElements/IfcDiscreteAccessoryType.java @@ -5,6 +5,5 @@ { public class IfcDiscreteAccessoryType extends IfcElementComponentType { - private IfcDiscreteAccessoryTypeEnum PredefinedType; } } diff --git a/IfcSharedComponentElements/IfcDiscreteAccessoryTypeEnum.java b/IfcSharedComponentElements/IfcDiscreteAccessoryTypeEnum.java deleted file mode 100644 index 24d5a009..00000000 --- a/IfcSharedComponentElements/IfcDiscreteAccessoryTypeEnum.java +++ /dev/null @@ -1,14 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcDiscreteAccessoryTypeEnum - { - ANCHORPLATE, - BRACKET, - SHOE, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcBuildingControlsDomain/IfcSensor.java b/IfcSharedComponentElements/IfcEdgeFeature.java similarity index 64% rename from IfcBuildingControlsDomain/IfcSensor.java rename to IfcSharedComponentElements/IfcEdgeFeature.java index c9818b3c..12a6234c 100644 --- a/IfcBuildingControlsDomain/IfcSensor.java +++ b/IfcSharedComponentElements/IfcEdgeFeature.java @@ -3,8 +3,8 @@ package buildingsmart.ifc { - public class IfcSensor extends IfcDistributionControlElement + public class IfcEdgeFeature extends IfcFeatureElementSubtraction { - private IfcSensorTypeEnum PredefinedType; + private IfcLengthMeasure FeatureLength; } } diff --git a/IfcSharedComponentElements/IfcFastener.java b/IfcSharedComponentElements/IfcFastener.java index 700d688d..ef0a0b6b 100644 --- a/IfcSharedComponentElements/IfcFastener.java +++ b/IfcSharedComponentElements/IfcFastener.java @@ -5,6 +5,5 @@ { public class IfcFastener extends IfcElementComponent { - private IfcFastenerTypeEnum PredefinedType; } } diff --git a/IfcSharedComponentElements/IfcFastenerType.java b/IfcSharedComponentElements/IfcFastenerType.java index ec96a918..f96ea08b 100644 --- a/IfcSharedComponentElements/IfcFastenerType.java +++ b/IfcSharedComponentElements/IfcFastenerType.java @@ -5,6 +5,5 @@ { public class IfcFastenerType extends IfcElementComponentType { - private IfcFastenerTypeEnum PredefinedType; } } diff --git a/IfcSharedComponentElements/IfcFastenerTypeEnum.java b/IfcSharedComponentElements/IfcFastenerTypeEnum.java deleted file mode 100644 index c2976c8c..00000000 --- a/IfcSharedComponentElements/IfcFastenerTypeEnum.java +++ /dev/null @@ -1,14 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcFastenerTypeEnum - { - GLUE, - MORTAR, - WELD, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcSharedComponentElements/IfcMechanicalFastener.java b/IfcSharedComponentElements/IfcMechanicalFastener.java index 3bfd1854..27a32df1 100644 --- a/IfcSharedComponentElements/IfcMechanicalFastener.java +++ b/IfcSharedComponentElements/IfcMechanicalFastener.java @@ -3,10 +3,9 @@ package buildingsmart.ifc { - public class IfcMechanicalFastener extends IfcElementComponent + public class IfcMechanicalFastener extends IfcFastener { private IfcLengthMeasure NominalDiameter; private IfcLengthMeasure NominalLength; - private IfcMechanicalFastenerTypeEnum PredefinedType; } } diff --git a/IfcSharedComponentElements/IfcMechanicalFastenerType.java b/IfcSharedComponentElements/IfcMechanicalFastenerType.java index 8afa40b1..696dcd28 100644 --- a/IfcSharedComponentElements/IfcMechanicalFastenerType.java +++ b/IfcSharedComponentElements/IfcMechanicalFastenerType.java @@ -3,10 +3,7 @@ package buildingsmart.ifc { - public class IfcMechanicalFastenerType extends IfcElementComponentType + public class IfcMechanicalFastenerType extends IfcFastenerType { - private IfcMechanicalFastenerTypeEnum PredefinedType; - private IfcLengthMeasure NominalDiameter; - private IfcLengthMeasure NominalLength; } } diff --git a/IfcSharedComponentElements/IfcMechanicalFastenerTypeEnum.java b/IfcSharedComponentElements/IfcMechanicalFastenerTypeEnum.java deleted file mode 100644 index b0a6a51e..00000000 --- a/IfcSharedComponentElements/IfcMechanicalFastenerTypeEnum.java +++ /dev/null @@ -1,21 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcMechanicalFastenerTypeEnum - { - ANCHORBOLT, - BOLT, - DOWEL, - NAIL, - NAILPLATE, - RIVET, - SCREW, - SHEARCONNECTOR, - STAPLE, - STUDSHEARCONNECTOR, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcGeometryResource/IfcSphericalSurface.java b/IfcSharedComponentElements/IfcRoundedEdgeFeature.java similarity index 78% rename from IfcGeometryResource/IfcSphericalSurface.java rename to IfcSharedComponentElements/IfcRoundedEdgeFeature.java index 08b7b513..baf80df8 100644 --- a/IfcGeometryResource/IfcSphericalSurface.java +++ b/IfcSharedComponentElements/IfcRoundedEdgeFeature.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcSphericalSurface extends IfcElementarySurface + public class IfcRoundedEdgeFeature extends IfcEdgeFeature { private IfcLengthMeasure Radius; } diff --git a/IfcSharedFacilitiesElements/IfcAsset.java b/IfcSharedFacilitiesElements/IfcAsset.java index 4070e3f7..56fc9013 100644 --- a/IfcSharedFacilitiesElements/IfcAsset.java +++ b/IfcSharedFacilitiesElements/IfcAsset.java @@ -5,14 +5,14 @@ { public class IfcAsset extends IfcGroup { - private string Identification; + private string AssetID; private IfcCostValue OriginalValue; private IfcCostValue CurrentValue; private IfcCostValue TotalReplacementCost; private IfcActorSelect Owner; private IfcActorSelect User; private IfcPerson ResponsiblePerson; - private string IncorporationDate; + private IfcCalendarDate IncorporationDate; private IfcCostValue DepreciatedValue; } } diff --git a/IfcSharedFacilitiesElements/IfcFurniture.java b/IfcSharedFacilitiesElements/IfcFurniture.java deleted file mode 100644 index 8ceb8f5f..00000000 --- a/IfcSharedFacilitiesElements/IfcFurniture.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcFurniture extends IfcFurnishingElement - { - private IfcFurnitureTypeEnum PredefinedType; - } -} diff --git a/IfcSharedFacilitiesElements/IfcFurnitureType.java b/IfcSharedFacilitiesElements/IfcFurnitureType.java index fa39d9b4..e29f653c 100644 --- a/IfcSharedFacilitiesElements/IfcFurnitureType.java +++ b/IfcSharedFacilitiesElements/IfcFurnitureType.java @@ -6,6 +6,5 @@ public class IfcFurnitureType extends IfcFurnishingElementType { private IfcAssemblyPlaceEnum AssemblyPlace; - private IfcFurnitureTypeEnum PredefinedType; } } diff --git a/IfcSharedFacilitiesElements/IfcFurnitureTypeEnum.java b/IfcSharedFacilitiesElements/IfcFurnitureTypeEnum.java deleted file mode 100644 index d2fafe4b..00000000 --- a/IfcSharedFacilitiesElements/IfcFurnitureTypeEnum.java +++ /dev/null @@ -1,18 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcFurnitureTypeEnum - { - CHAIR, - TABLE, - DESK, - BED, - FILECABINET, - SHELF, - SOFA, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcSharedFacilitiesElements/IfcInventory.java b/IfcSharedFacilitiesElements/IfcInventory.java index 59bdf765..282d6381 100644 --- a/IfcSharedFacilitiesElements/IfcInventory.java +++ b/IfcSharedFacilitiesElements/IfcInventory.java @@ -5,10 +5,10 @@ { public class IfcInventory extends IfcGroup { - private IfcInventoryTypeEnum PredefinedType; + private IfcInventoryTypeEnum InventoryType; private IfcActorSelect Jurisdiction; private IfcPerson[] ResponsiblePersons; - private string LastUpdateDate; + private IfcCalendarDate LastUpdateDate; private IfcCostValue CurrentValue; private IfcCostValue OriginalValue; } diff --git a/IfcSharedFacilitiesElements/IfcRelOccupiesSpaces.java b/IfcSharedFacilitiesElements/IfcRelOccupiesSpaces.java new file mode 100644 index 00000000..1ec9d654 --- /dev/null +++ b/IfcSharedFacilitiesElements/IfcRelOccupiesSpaces.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcRelOccupiesSpaces extends IfcRelAssignsToActor + { + } +} diff --git a/IfcSharedFacilitiesElements/IfcServiceLife.java b/IfcSharedFacilitiesElements/IfcServiceLife.java new file mode 100644 index 00000000..462c9ee3 --- /dev/null +++ b/IfcSharedFacilitiesElements/IfcServiceLife.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcServiceLife extends IfcControl + { + private IfcServiceLifeTypeEnum ServiceLifeType; + private double ServiceLifeDuration; + } +} diff --git a/IfcSharedFacilitiesElements/IfcServiceLifeFactor.java b/IfcSharedFacilitiesElements/IfcServiceLifeFactor.java new file mode 100644 index 00000000..c5bb6d84 --- /dev/null +++ b/IfcSharedFacilitiesElements/IfcServiceLifeFactor.java @@ -0,0 +1,13 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcServiceLifeFactor extends IfcPropertySetDefinition + { + private IfcServiceLifeFactorTypeEnum PredefinedType; + private IfcMeasureValue UpperValue; + private IfcMeasureValue MostUsedValue; + private IfcMeasureValue LowerValue; + } +} diff --git a/IfcBuildingControlsDomain/IfcUnitaryControlElementTypeEnum.java b/IfcSharedFacilitiesElements/IfcServiceLifeFactorTypeEnum.java similarity index 53% rename from IfcBuildingControlsDomain/IfcUnitaryControlElementTypeEnum.java rename to IfcSharedFacilitiesElements/IfcServiceLifeFactorTypeEnum.java index 3d74bd7c..b866a5fa 100644 --- a/IfcBuildingControlsDomain/IfcUnitaryControlElementTypeEnum.java +++ b/IfcSharedFacilitiesElements/IfcServiceLifeFactorTypeEnum.java @@ -3,16 +3,15 @@ package buildingsmart.ifc { - public enum IfcUnitaryControlElementTypeEnum + public enum IfcServiceLifeFactorTypeEnum { - ALARMPANEL, - CONTROLPANEL, - GASDETECTIONPANEL, - INDICATORPANEL, - MIMICPANEL, - HUMIDISTAT, - THERMOSTAT, - WEATHERSTATION, + A_QUALITYOFCOMPONENTS, + B_DESIGNLEVEL, + C_WORKEXECUTIONLEVEL, + D_INDOORENVIRONMENT, + E_OUTDOORENVIRONMENT, + F_INUSECONDITIONS, + G_MAINTENANCELEVEL, USERDEFINED, NOTDEFINED, } diff --git a/IfcSharedFacilitiesElements/IfcServiceLifeTypeEnum.java b/IfcSharedFacilitiesElements/IfcServiceLifeTypeEnum.java new file mode 100644 index 00000000..01a33049 --- /dev/null +++ b/IfcSharedFacilitiesElements/IfcServiceLifeTypeEnum.java @@ -0,0 +1,14 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public enum IfcServiceLifeTypeEnum + { + ACTUALSERVICELIFE, + EXPECTEDSERVICELIFE, + OPTIMISTICREFERENCESERVICELIFE, + PESSIMISTICREFERENCESERVICELIFE, + REFERENCESERVICELIFE, + } +} diff --git a/IfcSharedFacilitiesElements/IfcSystemFurnitureElement.java b/IfcSharedFacilitiesElements/IfcSystemFurnitureElement.java deleted file mode 100644 index 99f29a8b..00000000 --- a/IfcSharedFacilitiesElements/IfcSystemFurnitureElement.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSystemFurnitureElement extends IfcFurnishingElement - { - private IfcSystemFurnitureElementTypeEnum PredefinedType; - } -} diff --git a/IfcSharedFacilitiesElements/IfcSystemFurnitureElementType.java b/IfcSharedFacilitiesElements/IfcSystemFurnitureElementType.java index ca5d8cf3..05aeb960 100644 --- a/IfcSharedFacilitiesElements/IfcSystemFurnitureElementType.java +++ b/IfcSharedFacilitiesElements/IfcSystemFurnitureElementType.java @@ -5,6 +5,5 @@ { public class IfcSystemFurnitureElementType extends IfcFurnishingElementType { - private IfcSystemFurnitureElementTypeEnum PredefinedType; } } diff --git a/IfcSharedFacilitiesElements/IfcSystemFurnitureElementTypeEnum.java b/IfcSharedFacilitiesElements/IfcSystemFurnitureElementTypeEnum.java deleted file mode 100644 index 249f7d00..00000000 --- a/IfcSharedFacilitiesElements/IfcSystemFurnitureElementTypeEnum.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcSystemFurnitureElementTypeEnum - { - PANEL, - WORKSURFACE, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcSharedMgmtElements/IfcActionRequest.java b/IfcSharedMgmtElements/IfcActionRequest.java deleted file mode 100644 index 26d0aac0..00000000 --- a/IfcSharedMgmtElements/IfcActionRequest.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcActionRequest extends IfcControl - { - private IfcActionRequestTypeEnum PredefinedType; - private string Status; - private string LongDescription; - } -} diff --git a/IfcSharedMgmtElements/IfcActionRequestTypeEnum.java b/IfcSharedMgmtElements/IfcActionRequestTypeEnum.java deleted file mode 100644 index 56104bd9..00000000 --- a/IfcSharedMgmtElements/IfcActionRequestTypeEnum.java +++ /dev/null @@ -1,16 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcActionRequestTypeEnum - { - EMAIL, - FAX, - PHONE, - POST, - VERBAL, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcSharedMgmtElements/IfcCostItem.java b/IfcSharedMgmtElements/IfcCostItem.java index 307de4bd..e559e9ec 100644 --- a/IfcSharedMgmtElements/IfcCostItem.java +++ b/IfcSharedMgmtElements/IfcCostItem.java @@ -5,8 +5,5 @@ { public class IfcCostItem extends IfcControl { - private IfcCostItemTypeEnum PredefinedType; - private IfcCostValue[] CostValues; - private IfcPhysicalQuantity[] CostQuantities; } } diff --git a/IfcSharedMgmtElements/IfcCostItemTypeEnum.java b/IfcSharedMgmtElements/IfcCostItemTypeEnum.java deleted file mode 100644 index 4a3399a5..00000000 --- a/IfcSharedMgmtElements/IfcCostItemTypeEnum.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcCostItemTypeEnum - { - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcSharedMgmtElements/IfcCostSchedule.java b/IfcSharedMgmtElements/IfcCostSchedule.java index 19c7555b..8b5f18f6 100644 --- a/IfcSharedMgmtElements/IfcCostSchedule.java +++ b/IfcSharedMgmtElements/IfcCostSchedule.java @@ -5,9 +5,13 @@ { public class IfcCostSchedule extends IfcControl { - private IfcCostScheduleTypeEnum PredefinedType; + private IfcActorSelect SubmittedBy; + private IfcActorSelect PreparedBy; + private IfcDateTimeSelect SubmittedOn; private string Status; - private string SubmittedOn; - private string UpdateDate; + private IfcActorSelect[] TargetUsers; + private IfcDateTimeSelect UpdateDate; + private string ID; + private IfcCostScheduleTypeEnum PredefinedType; } } diff --git a/IfcSharedMgmtElements/IfcPermit.java b/IfcSharedMgmtElements/IfcPermit.java deleted file mode 100644 index 871caa4a..00000000 --- a/IfcSharedMgmtElements/IfcPermit.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcPermit extends IfcControl - { - private IfcPermitTypeEnum PredefinedType; - private string Status; - private string LongDescription; - } -} diff --git a/IfcSharedMgmtElements/IfcProjectOrder.java b/IfcSharedMgmtElements/IfcProjectOrder.java index 43dfc5a8..f5d3d324 100644 --- a/IfcSharedMgmtElements/IfcProjectOrder.java +++ b/IfcSharedMgmtElements/IfcProjectOrder.java @@ -5,8 +5,8 @@ { public class IfcProjectOrder extends IfcControl { + private string ID; private IfcProjectOrderTypeEnum PredefinedType; private string Status; - private string LongDescription; } } diff --git a/IfcSharedMgmtElements/IfcProjectOrderRecord.java b/IfcSharedMgmtElements/IfcProjectOrderRecord.java new file mode 100644 index 00000000..95dfec1c --- /dev/null +++ b/IfcSharedMgmtElements/IfcProjectOrderRecord.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcProjectOrderRecord extends IfcControl + { + private IfcRelAssignsToProjectOrder[] Records; + private IfcProjectOrderRecordTypeEnum PredefinedType; + } +} diff --git a/IfcSharedMgmtElements/IfcPermitTypeEnum.java b/IfcSharedMgmtElements/IfcProjectOrderRecordTypeEnum.java similarity index 72% rename from IfcSharedMgmtElements/IfcPermitTypeEnum.java rename to IfcSharedMgmtElements/IfcProjectOrderRecordTypeEnum.java index ffc3f482..c5f80170 100644 --- a/IfcSharedMgmtElements/IfcPermitTypeEnum.java +++ b/IfcSharedMgmtElements/IfcProjectOrderRecordTypeEnum.java @@ -3,10 +3,12 @@ package buildingsmart.ifc { - public enum IfcPermitTypeEnum + public enum IfcProjectOrderRecordTypeEnum { - ACCESS, - BUILDING, + CHANGE, + MAINTENANCE, + MOVE, + PURCHASE, WORK, USERDEFINED, NOTDEFINED, diff --git a/IfcSharedMgmtElements/IfcRelAssignsToProjectOrder.java b/IfcSharedMgmtElements/IfcRelAssignsToProjectOrder.java new file mode 100644 index 00000000..204957b4 --- /dev/null +++ b/IfcSharedMgmtElements/IfcRelAssignsToProjectOrder.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcRelAssignsToProjectOrder extends IfcRelAssignsToControl + { + } +} diff --git a/IfcSharedMgmtElements/IfcRelAssociatesAppliedValue.java b/IfcSharedMgmtElements/IfcRelAssociatesAppliedValue.java new file mode 100644 index 00000000..a75c9393 --- /dev/null +++ b/IfcSharedMgmtElements/IfcRelAssociatesAppliedValue.java @@ -0,0 +1,10 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcRelAssociatesAppliedValue extends IfcRelAssociates + { + private IfcAppliedValue RelatingAppliedValue; + } +} diff --git a/IfcSharedMgmtElements/IfcRelSchedulesCostItems.java b/IfcSharedMgmtElements/IfcRelSchedulesCostItems.java new file mode 100644 index 00000000..7d37dc06 --- /dev/null +++ b/IfcSharedMgmtElements/IfcRelSchedulesCostItems.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcRelSchedulesCostItems extends IfcRelAssignsToControl + { + } +} diff --git a/IfcStructuralAnalysisDomain/IfcLoadGroupTypeEnum.java b/IfcStructuralAnalysisDomain/IfcLoadGroupTypeEnum.java index 847af330..8df7c595 100644 --- a/IfcStructuralAnalysisDomain/IfcLoadGroupTypeEnum.java +++ b/IfcStructuralAnalysisDomain/IfcLoadGroupTypeEnum.java @@ -7,6 +7,7 @@ public enum IfcLoadGroupTypeEnum { LOAD_GROUP, LOAD_CASE, + LOAD_COMBINATION_GROUP, LOAD_COMBINATION, USERDEFINED, NOTDEFINED, diff --git a/IfcKernel/IfcDefinitionSelect.java b/IfcStructuralAnalysisDomain/IfcOrientationSelect.java similarity index 83% rename from IfcKernel/IfcDefinitionSelect.java rename to IfcStructuralAnalysisDomain/IfcOrientationSelect.java index 75341e11..4c20a966 100644 --- a/IfcKernel/IfcDefinitionSelect.java +++ b/IfcStructuralAnalysisDomain/IfcOrientationSelect.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public interface IfcDefinitionSelect + public interface IfcOrientationSelect { } } diff --git a/IfcStructuralAnalysisDomain/IfcRelAssociatesProfileProperties.java b/IfcStructuralAnalysisDomain/IfcRelAssociatesProfileProperties.java new file mode 100644 index 00000000..8d822463 --- /dev/null +++ b/IfcStructuralAnalysisDomain/IfcRelAssociatesProfileProperties.java @@ -0,0 +1,12 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcRelAssociatesProfileProperties extends IfcRelAssociates + { + private IfcProfileProperties RelatingProfileProperties; + private IfcShapeAspect ProfileSectionLocation; + private IfcOrientationSelect ProfileOrientation; + } +} diff --git a/IfcStructuralAnalysisDomain/IfcRelConnectsStructuralElement.java b/IfcStructuralAnalysisDomain/IfcRelConnectsStructuralElement.java new file mode 100644 index 00000000..359738c3 --- /dev/null +++ b/IfcStructuralAnalysisDomain/IfcRelConnectsStructuralElement.java @@ -0,0 +1,11 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcRelConnectsStructuralElement extends IfcRelConnects + { + private IfcElement RelatingElement; + private IfcStructuralMember RelatedStructuralMember; + } +} diff --git a/IfcStructuralAnalysisDomain/IfcStructuralAction.java b/IfcStructuralAnalysisDomain/IfcStructuralAction.java index ffaaddc1..d55f15a4 100644 --- a/IfcStructuralAnalysisDomain/IfcStructuralAction.java +++ b/IfcStructuralAnalysisDomain/IfcStructuralAction.java @@ -5,6 +5,7 @@ { public class IfcStructuralAction extends IfcStructuralActivity { - private bool DestabilizingLoad; + private BOOLEAN DestabilizingLoad; + private IfcStructuralReaction CausedBy; } } diff --git a/IfcStructuralAnalysisDomain/IfcStructuralActivity.java b/IfcStructuralAnalysisDomain/IfcStructuralActivity.java index 84000379..bcb6da9d 100644 --- a/IfcStructuralAnalysisDomain/IfcStructuralActivity.java +++ b/IfcStructuralAnalysisDomain/IfcStructuralActivity.java @@ -7,6 +7,6 @@ public class IfcStructuralActivity extends IfcProduct { private IfcStructuralLoad AppliedLoad; private IfcGlobalOrLocalEnum GlobalOrLocal; - private IfcRelConnectsStructuralActivity[] AssignedToStructuralItem; + private IfcRelConnectsStructuralActivity AssignedToStructuralItem; } } diff --git a/IfcStructuralAnalysisDomain/IfcStructuralAnalysisModel.java b/IfcStructuralAnalysisDomain/IfcStructuralAnalysisModel.java index df54e1cd..b8b9a4d1 100644 --- a/IfcStructuralAnalysisDomain/IfcStructuralAnalysisModel.java +++ b/IfcStructuralAnalysisDomain/IfcStructuralAnalysisModel.java @@ -9,6 +9,5 @@ public class IfcStructuralAnalysisModel extends IfcSystem private IfcAxis2Placement3D OrientationOf2DPlane; private IfcStructuralLoadGroup[] LoadedBy; private IfcStructuralResultGroup[] HasResults; - private IfcObjectPlacement SharedPlacement; } } diff --git a/IfcStructuralAnalysisDomain/IfcStructuralCurveAction.java b/IfcStructuralAnalysisDomain/IfcStructuralCurveAction.java deleted file mode 100644 index a7a6eb5f..00000000 --- a/IfcStructuralAnalysisDomain/IfcStructuralCurveAction.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcStructuralCurveAction extends IfcStructuralAction - { - private IfcProjectedOrTrueLengthEnum ProjectedOrTrue; - private IfcStructuralCurveActivityTypeEnum PredefinedType; - } -} diff --git a/IfcStructuralAnalysisDomain/IfcStructuralCurveActivityTypeEnum.java b/IfcStructuralAnalysisDomain/IfcStructuralCurveActivityTypeEnum.java deleted file mode 100644 index cfbbc2c5..00000000 --- a/IfcStructuralAnalysisDomain/IfcStructuralCurveActivityTypeEnum.java +++ /dev/null @@ -1,18 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcStructuralCurveActivityTypeEnum - { - CONST, - LINEAR, - POLYGONAL, - EQUIDISTANT, - SINUS, - PARABOLA, - DISCRETE, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcStructuralAnalysisDomain/IfcStructuralCurveConnection.java b/IfcStructuralAnalysisDomain/IfcStructuralCurveConnection.java index f7273b0f..c4d460d7 100644 --- a/IfcStructuralAnalysisDomain/IfcStructuralCurveConnection.java +++ b/IfcStructuralAnalysisDomain/IfcStructuralCurveConnection.java @@ -5,6 +5,5 @@ { public class IfcStructuralCurveConnection extends IfcStructuralConnection { - private IfcDirection Axis; } } diff --git a/IfcStructuralAnalysisDomain/IfcStructuralCurveMember.java b/IfcStructuralAnalysisDomain/IfcStructuralCurveMember.java index 11f4bbd1..350ccb07 100644 --- a/IfcStructuralAnalysisDomain/IfcStructuralCurveMember.java +++ b/IfcStructuralAnalysisDomain/IfcStructuralCurveMember.java @@ -5,7 +5,6 @@ { public class IfcStructuralCurveMember extends IfcStructuralMember { - private IfcStructuralCurveMemberTypeEnum PredefinedType; - private IfcDirection Axis; + private IfcStructuralCurveTypeEnum PredefinedType; } } diff --git a/IfcStructuralAnalysisDomain/IfcStructuralCurveReaction.java b/IfcStructuralAnalysisDomain/IfcStructuralCurveReaction.java deleted file mode 100644 index 08d82bcc..00000000 --- a/IfcStructuralAnalysisDomain/IfcStructuralCurveReaction.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcStructuralCurveReaction extends IfcStructuralReaction - { - private IfcStructuralCurveActivityTypeEnum PredefinedType; - } -} diff --git a/IfcStructuralAnalysisDomain/IfcStructuralCurveMemberTypeEnum.java b/IfcStructuralAnalysisDomain/IfcStructuralCurveTypeEnum.java similarity index 87% rename from IfcStructuralAnalysisDomain/IfcStructuralCurveMemberTypeEnum.java rename to IfcStructuralAnalysisDomain/IfcStructuralCurveTypeEnum.java index 4395125e..8308a78f 100644 --- a/IfcStructuralAnalysisDomain/IfcStructuralCurveMemberTypeEnum.java +++ b/IfcStructuralAnalysisDomain/IfcStructuralCurveTypeEnum.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public enum IfcStructuralCurveMemberTypeEnum + public enum IfcStructuralCurveTypeEnum { RIGID_JOINED_MEMBER, PIN_JOINED_MEMBER, diff --git a/IfcStructuralAnalysisDomain/IfcStructuralLinearAction.java b/IfcStructuralAnalysisDomain/IfcStructuralLinearAction.java index 7190ce52..2e60adf9 100644 --- a/IfcStructuralAnalysisDomain/IfcStructuralLinearAction.java +++ b/IfcStructuralAnalysisDomain/IfcStructuralLinearAction.java @@ -3,7 +3,8 @@ package buildingsmart.ifc { - public class IfcStructuralLinearAction extends IfcStructuralCurveAction + public class IfcStructuralLinearAction extends IfcStructuralAction { + private IfcProjectedOrTrueLengthEnum ProjectedOrTrue; } } diff --git a/IfcStructuralAnalysisDomain/IfcStructuralLinearActionVarying.java b/IfcStructuralAnalysisDomain/IfcStructuralLinearActionVarying.java new file mode 100644 index 00000000..69b54371 --- /dev/null +++ b/IfcStructuralAnalysisDomain/IfcStructuralLinearActionVarying.java @@ -0,0 +1,12 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcStructuralLinearActionVarying extends IfcStructuralLinearAction + { + private IfcShapeAspect VaryingAppliedLoadLocation; + private IfcStructuralLoad[] SubsequentAppliedLoads; + private IfcStructuralLoad[] VaryingAppliedLoads; + } +} diff --git a/IfcStructuralAnalysisDomain/IfcStructuralLoadCase.java b/IfcStructuralAnalysisDomain/IfcStructuralLoadCase.java deleted file mode 100644 index aeb0b7a3..00000000 --- a/IfcStructuralAnalysisDomain/IfcStructuralLoadCase.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcStructuralLoadCase extends IfcStructuralLoadGroup - { - private double[] SelfWeightCoefficients; - } -} diff --git a/IfcStructuralAnalysisDomain/IfcStructuralMember.java b/IfcStructuralAnalysisDomain/IfcStructuralMember.java index 87afc416..c459ef8c 100644 --- a/IfcStructuralAnalysisDomain/IfcStructuralMember.java +++ b/IfcStructuralAnalysisDomain/IfcStructuralMember.java @@ -5,6 +5,7 @@ { public class IfcStructuralMember extends IfcStructuralItem { + private IfcRelConnectsStructuralElement[] ReferencesElement; private IfcRelConnectsStructuralMember[] ConnectedBy; } } diff --git a/IfcStructuralAnalysisDomain/IfcStructuralPlanarAction.java b/IfcStructuralAnalysisDomain/IfcStructuralPlanarAction.java index 4d111042..7376ddf8 100644 --- a/IfcStructuralAnalysisDomain/IfcStructuralPlanarAction.java +++ b/IfcStructuralAnalysisDomain/IfcStructuralPlanarAction.java @@ -3,7 +3,8 @@ package buildingsmart.ifc { - public class IfcStructuralPlanarAction extends IfcStructuralSurfaceAction + public class IfcStructuralPlanarAction extends IfcStructuralAction { + private IfcProjectedOrTrueLengthEnum ProjectedOrTrue; } } diff --git a/IfcStructuralAnalysisDomain/IfcStructuralPlanarActionVarying.java b/IfcStructuralAnalysisDomain/IfcStructuralPlanarActionVarying.java new file mode 100644 index 00000000..1d7c2ba6 --- /dev/null +++ b/IfcStructuralAnalysisDomain/IfcStructuralPlanarActionVarying.java @@ -0,0 +1,12 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcStructuralPlanarActionVarying extends IfcStructuralPlanarAction + { + private IfcShapeAspect VaryingAppliedLoadLocation; + private IfcStructuralLoad[] SubsequentAppliedLoads; + private IfcStructuralLoad[] VaryingAppliedLoads; + } +} diff --git a/IfcStructuralAnalysisDomain/IfcStructuralPointConnection.java b/IfcStructuralAnalysisDomain/IfcStructuralPointConnection.java index 9f563a72..3755a113 100644 --- a/IfcStructuralAnalysisDomain/IfcStructuralPointConnection.java +++ b/IfcStructuralAnalysisDomain/IfcStructuralPointConnection.java @@ -5,6 +5,5 @@ { public class IfcStructuralPointConnection extends IfcStructuralConnection { - private IfcAxis2Placement3D ConditionCoordinateSystem; } } diff --git a/IfcStructuralAnalysisDomain/IfcStructuralReaction.java b/IfcStructuralAnalysisDomain/IfcStructuralReaction.java index 35ad81e0..0ebc4cab 100644 --- a/IfcStructuralAnalysisDomain/IfcStructuralReaction.java +++ b/IfcStructuralAnalysisDomain/IfcStructuralReaction.java @@ -5,5 +5,6 @@ { public class IfcStructuralReaction extends IfcStructuralActivity { + private IfcStructuralAction[] Causes; } } diff --git a/IfcStructuralAnalysisDomain/IfcStructuralResultGroup.java b/IfcStructuralAnalysisDomain/IfcStructuralResultGroup.java index f94a0498..a0910791 100644 --- a/IfcStructuralAnalysisDomain/IfcStructuralResultGroup.java +++ b/IfcStructuralAnalysisDomain/IfcStructuralResultGroup.java @@ -7,7 +7,7 @@ public class IfcStructuralResultGroup extends IfcGroup { private IfcAnalysisTheoryTypeEnum TheoryType; private IfcStructuralLoadGroup ResultForLoadGroup; - private bool IsLinear; + private BOOLEAN IsLinear; private IfcStructuralAnalysisModel[] ResultGroupFor; } } diff --git a/IfcStructuralAnalysisDomain/IfcStructuralSurfaceAction.java b/IfcStructuralAnalysisDomain/IfcStructuralSurfaceAction.java deleted file mode 100644 index 3cbb4b57..00000000 --- a/IfcStructuralAnalysisDomain/IfcStructuralSurfaceAction.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcStructuralSurfaceAction extends IfcStructuralAction - { - private IfcProjectedOrTrueLengthEnum ProjectedOrTrue; - private IfcStructuralSurfaceActivityTypeEnum PredefinedType; - } -} diff --git a/IfcStructuralAnalysisDomain/IfcStructuralSurfaceActivityTypeEnum.java b/IfcStructuralAnalysisDomain/IfcStructuralSurfaceActivityTypeEnum.java deleted file mode 100644 index ee82b7c6..00000000 --- a/IfcStructuralAnalysisDomain/IfcStructuralSurfaceActivityTypeEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcStructuralSurfaceActivityTypeEnum - { - CONST, - BILINEAR, - DISCRETE, - ISOCONTOUR, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcStructuralAnalysisDomain/IfcStructuralSurfaceMember.java b/IfcStructuralAnalysisDomain/IfcStructuralSurfaceMember.java index 52527282..e0e57216 100644 --- a/IfcStructuralAnalysisDomain/IfcStructuralSurfaceMember.java +++ b/IfcStructuralAnalysisDomain/IfcStructuralSurfaceMember.java @@ -5,7 +5,7 @@ { public class IfcStructuralSurfaceMember extends IfcStructuralMember { - private IfcStructuralSurfaceMemberTypeEnum PredefinedType; + private IfcStructuralSurfaceTypeEnum PredefinedType; private IfcLengthMeasure Thickness; } } diff --git a/IfcStructuralAnalysisDomain/IfcStructuralSurfaceMemberVarying.java b/IfcStructuralAnalysisDomain/IfcStructuralSurfaceMemberVarying.java index 5df9fbb7..f59ea2aa 100644 --- a/IfcStructuralAnalysisDomain/IfcStructuralSurfaceMemberVarying.java +++ b/IfcStructuralAnalysisDomain/IfcStructuralSurfaceMemberVarying.java @@ -5,5 +5,8 @@ { public class IfcStructuralSurfaceMemberVarying extends IfcStructuralSurfaceMember { + private IfcLengthMeasure[] SubsequentThickness; + private IfcShapeAspect VaryingThicknessLocation; + private IfcLengthMeasure[] VaryingThickness; } } diff --git a/IfcStructuralAnalysisDomain/IfcStructuralSurfaceReaction.java b/IfcStructuralAnalysisDomain/IfcStructuralSurfaceReaction.java deleted file mode 100644 index 56f9698e..00000000 --- a/IfcStructuralAnalysisDomain/IfcStructuralSurfaceReaction.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcStructuralSurfaceReaction extends IfcStructuralReaction - { - private IfcStructuralSurfaceActivityTypeEnum PredefinedType; - } -} diff --git a/IfcStructuralAnalysisDomain/IfcStructuralSurfaceMemberTypeEnum.java b/IfcStructuralAnalysisDomain/IfcStructuralSurfaceTypeEnum.java similarity index 85% rename from IfcStructuralAnalysisDomain/IfcStructuralSurfaceMemberTypeEnum.java rename to IfcStructuralAnalysisDomain/IfcStructuralSurfaceTypeEnum.java index 7251a737..58ed3f2b 100644 --- a/IfcStructuralAnalysisDomain/IfcStructuralSurfaceMemberTypeEnum.java +++ b/IfcStructuralAnalysisDomain/IfcStructuralSurfaceTypeEnum.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public enum IfcStructuralSurfaceMemberTypeEnum + public enum IfcStructuralSurfaceTypeEnum { BENDING_ELEMENT, MEMBRANE_ELEMENT, diff --git a/IfcStructuralElementsDomain/IfcBendingParameterSelect.java b/IfcStructuralElementsDomain/IfcBendingParameterSelect.java deleted file mode 100644 index 4e086359..00000000 --- a/IfcStructuralElementsDomain/IfcBendingParameterSelect.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public interface IfcBendingParameterSelect - { - } -} diff --git a/IfcStructuralElementsDomain/IfcBuildingElementComponent.java b/IfcStructuralElementsDomain/IfcBuildingElementComponent.java new file mode 100644 index 00000000..288444ec --- /dev/null +++ b/IfcStructuralElementsDomain/IfcBuildingElementComponent.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcBuildingElementComponent extends IfcBuildingElement + { + } +} diff --git a/IfcStructuralElementsDomain/IfcBuildingElementPart.java b/IfcStructuralElementsDomain/IfcBuildingElementPart.java new file mode 100644 index 00000000..6fc1fac0 --- /dev/null +++ b/IfcStructuralElementsDomain/IfcBuildingElementPart.java @@ -0,0 +1,9 @@ +// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. +// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. + +package buildingsmart.ifc +{ + public class IfcBuildingElementPart extends IfcBuildingElementComponent + { + } +} diff --git a/IfcStructuralElementsDomain/IfcFootingType.java b/IfcStructuralElementsDomain/IfcFootingType.java deleted file mode 100644 index 08b5128a..00000000 --- a/IfcStructuralElementsDomain/IfcFootingType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcFootingType extends IfcBuildingElementType - { - private IfcFootingTypeEnum PredefinedType; - } -} diff --git a/IfcStructuralElementsDomain/IfcFootingTypeEnum.java b/IfcStructuralElementsDomain/IfcFootingTypeEnum.java index 5b43f341..31d9198e 100644 --- a/IfcStructuralElementsDomain/IfcFootingTypeEnum.java +++ b/IfcStructuralElementsDomain/IfcFootingTypeEnum.java @@ -5,7 +5,6 @@ { public enum IfcFootingTypeEnum { - CAISSON_FOUNDATION, FOOTING_BEAM, PAD_FOOTING, PILE_CAP, diff --git a/IfcStructuralElementsDomain/IfcPileType.java b/IfcStructuralElementsDomain/IfcPileType.java deleted file mode 100644 index aa9f1a24..00000000 --- a/IfcStructuralElementsDomain/IfcPileType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcPileType extends IfcBuildingElementType - { - private IfcPileTypeEnum PredefinedType; - } -} diff --git a/IfcStructuralElementsDomain/IfcPileTypeEnum.java b/IfcStructuralElementsDomain/IfcPileTypeEnum.java index fb28f741..7afad1e6 100644 --- a/IfcStructuralElementsDomain/IfcPileTypeEnum.java +++ b/IfcStructuralElementsDomain/IfcPileTypeEnum.java @@ -5,9 +5,6 @@ { public enum IfcPileTypeEnum { - BORED, - DRIVEN, - JETGROUTING, COHESION, FRICTION, SUPPORT, diff --git a/IfcStructuralElementsDomain/IfcReinforcementDefinitionProperties.java b/IfcStructuralElementsDomain/IfcReinforcementDefinitionProperties.java index 7382e0ca..8a49e7fb 100644 --- a/IfcStructuralElementsDomain/IfcReinforcementDefinitionProperties.java +++ b/IfcStructuralElementsDomain/IfcReinforcementDefinitionProperties.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcReinforcementDefinitionProperties extends IfcPreDefinedPropertySet + public class IfcReinforcementDefinitionProperties extends IfcPropertySetDefinition { private string DefinitionType; private IfcSectionReinforcementProperties[] ReinforcementSectionDefinitions; diff --git a/IfcStructuralElementsDomain/IfcReinforcingBar.java b/IfcStructuralElementsDomain/IfcReinforcingBar.java index 9e5b4226..1af47979 100644 --- a/IfcStructuralElementsDomain/IfcReinforcingBar.java +++ b/IfcStructuralElementsDomain/IfcReinforcingBar.java @@ -8,7 +8,7 @@ public class IfcReinforcingBar extends IfcReinforcingElement private IfcLengthMeasure NominalDiameter; private double CrossSectionArea; private IfcLengthMeasure BarLength; - private IfcReinforcingBarTypeEnum PredefinedType; + private IfcReinforcingBarRoleEnum BarRole; private IfcReinforcingBarSurfaceEnum BarSurface; } } diff --git a/IfcStructuralElementsDomain/IfcReinforcingBarType.java b/IfcStructuralElementsDomain/IfcReinforcingBarType.java deleted file mode 100644 index 4dfd388f..00000000 --- a/IfcStructuralElementsDomain/IfcReinforcingBarType.java +++ /dev/null @@ -1,16 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcReinforcingBarType extends IfcReinforcingElementType - { - private IfcReinforcingBarTypeEnum PredefinedType; - private IfcLengthMeasure NominalDiameter; - private double CrossSectionArea; - private IfcLengthMeasure BarLength; - private IfcReinforcingBarSurfaceEnum BarSurface; - private string BendingShapeCode; - private IfcBendingParameterSelect[] BendingParameters; - } -} diff --git a/IfcStructuralElementsDomain/IfcReinforcingBarTypeEnum.java b/IfcStructuralElementsDomain/IfcReinforcingBarTypeEnum.java deleted file mode 100644 index 3cbfeb0c..00000000 --- a/IfcStructuralElementsDomain/IfcReinforcingBarTypeEnum.java +++ /dev/null @@ -1,19 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcReinforcingBarTypeEnum - { - ANCHORING, - EDGE, - LIGATURE, - MAIN, - PUNCHING, - RING, - SHEAR, - STUD, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcStructuralElementsDomain/IfcReinforcingElement.java b/IfcStructuralElementsDomain/IfcReinforcingElement.java index 810677d5..b710334e 100644 --- a/IfcStructuralElementsDomain/IfcReinforcingElement.java +++ b/IfcStructuralElementsDomain/IfcReinforcingElement.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcReinforcingElement extends IfcElementComponent + public class IfcReinforcingElement extends IfcBuildingElementComponent { private string SteelGrade; } diff --git a/IfcStructuralElementsDomain/IfcReinforcingElementType.java b/IfcStructuralElementsDomain/IfcReinforcingElementType.java deleted file mode 100644 index 4bb1bec7..00000000 --- a/IfcStructuralElementsDomain/IfcReinforcingElementType.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcReinforcingElementType extends IfcElementComponentType - { - } -} diff --git a/IfcStructuralElementsDomain/IfcReinforcingMesh.java b/IfcStructuralElementsDomain/IfcReinforcingMesh.java index 5f9b4e17..698ec531 100644 --- a/IfcStructuralElementsDomain/IfcReinforcingMesh.java +++ b/IfcStructuralElementsDomain/IfcReinforcingMesh.java @@ -13,6 +13,5 @@ public class IfcReinforcingMesh extends IfcReinforcingElement private double TransverseBarCrossSectionArea; private IfcLengthMeasure LongitudinalBarSpacing; private IfcLengthMeasure TransverseBarSpacing; - private IfcReinforcingMeshTypeEnum PredefinedType; } } diff --git a/IfcStructuralElementsDomain/IfcReinforcingMeshType.java b/IfcStructuralElementsDomain/IfcReinforcingMeshType.java deleted file mode 100644 index 91576be6..00000000 --- a/IfcStructuralElementsDomain/IfcReinforcingMeshType.java +++ /dev/null @@ -1,20 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcReinforcingMeshType extends IfcReinforcingElementType - { - private IfcReinforcingMeshTypeEnum PredefinedType; - private IfcLengthMeasure MeshLength; - private IfcLengthMeasure MeshWidth; - private IfcLengthMeasure LongitudinalBarNominalDiameter; - private IfcLengthMeasure TransverseBarNominalDiameter; - private double LongitudinalBarCrossSectionArea; - private double TransverseBarCrossSectionArea; - private IfcLengthMeasure LongitudinalBarSpacing; - private IfcLengthMeasure TransverseBarSpacing; - private string BendingShapeCode; - private IfcBendingParameterSelect[] BendingParameters; - } -} diff --git a/IfcStructuralElementsDomain/IfcReinforcingMeshTypeEnum.java b/IfcStructuralElementsDomain/IfcReinforcingMeshTypeEnum.java deleted file mode 100644 index 29c0634b..00000000 --- a/IfcStructuralElementsDomain/IfcReinforcingMeshTypeEnum.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcReinforcingMeshTypeEnum - { - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcStructuralElementsDomain/IfcSurfaceFeature.java b/IfcStructuralElementsDomain/IfcSurfaceFeature.java deleted file mode 100644 index fcaef6c9..00000000 --- a/IfcStructuralElementsDomain/IfcSurfaceFeature.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSurfaceFeature extends IfcFeatureElement - { - private IfcSurfaceFeatureTypeEnum PredefinedType; - } -} diff --git a/IfcStructuralElementsDomain/IfcSurfaceFeatureTypeEnum.java b/IfcStructuralElementsDomain/IfcSurfaceFeatureTypeEnum.java deleted file mode 100644 index 3756ef9b..00000000 --- a/IfcStructuralElementsDomain/IfcSurfaceFeatureTypeEnum.java +++ /dev/null @@ -1,14 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcSurfaceFeatureTypeEnum - { - MARK, - TAG, - TREATMENT, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcStructuralElementsDomain/IfcTendonAnchor.java b/IfcStructuralElementsDomain/IfcTendonAnchor.java index ee2148c7..d3752d41 100644 --- a/IfcStructuralElementsDomain/IfcTendonAnchor.java +++ b/IfcStructuralElementsDomain/IfcTendonAnchor.java @@ -5,6 +5,5 @@ { public class IfcTendonAnchor extends IfcReinforcingElement { - private IfcTendonAnchorTypeEnum PredefinedType; } } diff --git a/IfcStructuralElementsDomain/IfcTendonAnchorType.java b/IfcStructuralElementsDomain/IfcTendonAnchorType.java deleted file mode 100644 index 69247e21..00000000 --- a/IfcStructuralElementsDomain/IfcTendonAnchorType.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcTendonAnchorType extends IfcReinforcingElementType - { - private IfcTendonAnchorTypeEnum PredefinedType; - } -} diff --git a/IfcStructuralElementsDomain/IfcTendonAnchorTypeEnum.java b/IfcStructuralElementsDomain/IfcTendonAnchorTypeEnum.java deleted file mode 100644 index 620a9825..00000000 --- a/IfcStructuralElementsDomain/IfcTendonAnchorTypeEnum.java +++ /dev/null @@ -1,14 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcTendonAnchorTypeEnum - { - COUPLER, - FIXED_END, - TENSIONING_END, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcStructuralElementsDomain/IfcTendonType.java b/IfcStructuralElementsDomain/IfcTendonType.java deleted file mode 100644 index f05d6e99..00000000 --- a/IfcStructuralElementsDomain/IfcTendonType.java +++ /dev/null @@ -1,13 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcTendonType extends IfcReinforcingElementType - { - private IfcTendonTypeEnum PredefinedType; - private IfcLengthMeasure NominalDiameter; - private double CrossSectionArea; - private IfcLengthMeasure SheathDiameter; - } -} diff --git a/IfcStructuralElementsDomain/IfcTendonTypeEnum.java b/IfcStructuralElementsDomain/IfcTendonTypeEnum.java index d88fd3d3..6fedbcfe 100644 --- a/IfcStructuralElementsDomain/IfcTendonTypeEnum.java +++ b/IfcStructuralElementsDomain/IfcTendonTypeEnum.java @@ -5,10 +5,10 @@ { public enum IfcTendonTypeEnum { - BAR, - COATED, STRAND, WIRE, + BAR, + COATED, USERDEFINED, NOTDEFINED, } diff --git a/IfcStructuralElementsDomain/IfcVoidingFeature.java b/IfcStructuralElementsDomain/IfcVoidingFeature.java deleted file mode 100644 index 352264c2..00000000 --- a/IfcStructuralElementsDomain/IfcVoidingFeature.java +++ /dev/null @@ -1,10 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcVoidingFeature extends IfcFeatureElementSubtraction - { - private IfcVoidingFeatureTypeEnum PredefinedType; - } -} diff --git a/IfcStructuralElementsDomain/IfcVoidingFeatureTypeEnum.java b/IfcStructuralElementsDomain/IfcVoidingFeatureTypeEnum.java deleted file mode 100644 index 61caa62b..00000000 --- a/IfcStructuralElementsDomain/IfcVoidingFeatureTypeEnum.java +++ /dev/null @@ -1,17 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public enum IfcVoidingFeatureTypeEnum - { - CUTOUT, - NOTCH, - HOLE, - MITER, - CHAMFER, - EDGE, - USERDEFINED, - NOTDEFINED, - } -} diff --git a/IfcStructuralLoadResource/IfcBoundaryEdgeCondition.java b/IfcStructuralLoadResource/IfcBoundaryEdgeCondition.java index b6b42941..5c17edae 100644 --- a/IfcStructuralLoadResource/IfcBoundaryEdgeCondition.java +++ b/IfcStructuralLoadResource/IfcBoundaryEdgeCondition.java @@ -5,11 +5,11 @@ { public class IfcBoundaryEdgeCondition extends IfcBoundaryCondition { - private IfcModulusOfTranslationalSubgradeReactionSelect TranslationalStiffnessByLengthX; - private IfcModulusOfTranslationalSubgradeReactionSelect TranslationalStiffnessByLengthY; - private IfcModulusOfTranslationalSubgradeReactionSelect TranslationalStiffnessByLengthZ; - private IfcModulusOfRotationalSubgradeReactionSelect RotationalStiffnessByLengthX; - private IfcModulusOfRotationalSubgradeReactionSelect RotationalStiffnessByLengthY; - private IfcModulusOfRotationalSubgradeReactionSelect RotationalStiffnessByLengthZ; + private double LinearStiffnessByLengthX; + private double LinearStiffnessByLengthY; + private double LinearStiffnessByLengthZ; + private double RotationalStiffnessByLengthX; + private double RotationalStiffnessByLengthY; + private double RotationalStiffnessByLengthZ; } } diff --git a/IfcStructuralLoadResource/IfcBoundaryFaceCondition.java b/IfcStructuralLoadResource/IfcBoundaryFaceCondition.java index f9895760..7b35ddf3 100644 --- a/IfcStructuralLoadResource/IfcBoundaryFaceCondition.java +++ b/IfcStructuralLoadResource/IfcBoundaryFaceCondition.java @@ -5,8 +5,8 @@ { public class IfcBoundaryFaceCondition extends IfcBoundaryCondition { - private IfcModulusOfSubgradeReactionSelect TranslationalStiffnessByAreaX; - private IfcModulusOfSubgradeReactionSelect TranslationalStiffnessByAreaY; - private IfcModulusOfSubgradeReactionSelect TranslationalStiffnessByAreaZ; + private double LinearStiffnessByAreaX; + private double LinearStiffnessByAreaY; + private double LinearStiffnessByAreaZ; } } diff --git a/IfcStructuralLoadResource/IfcBoundaryNodeCondition.java b/IfcStructuralLoadResource/IfcBoundaryNodeCondition.java index fbaa56c8..98e71807 100644 --- a/IfcStructuralLoadResource/IfcBoundaryNodeCondition.java +++ b/IfcStructuralLoadResource/IfcBoundaryNodeCondition.java @@ -5,11 +5,11 @@ { public class IfcBoundaryNodeCondition extends IfcBoundaryCondition { - private IfcTranslationalStiffnessSelect TranslationalStiffnessX; - private IfcTranslationalStiffnessSelect TranslationalStiffnessY; - private IfcTranslationalStiffnessSelect TranslationalStiffnessZ; - private IfcRotationalStiffnessSelect RotationalStiffnessX; - private IfcRotationalStiffnessSelect RotationalStiffnessY; - private IfcRotationalStiffnessSelect RotationalStiffnessZ; + private double LinearStiffnessX; + private double LinearStiffnessY; + private double LinearStiffnessZ; + private double RotationalStiffnessX; + private double RotationalStiffnessY; + private double RotationalStiffnessZ; } } diff --git a/IfcStructuralLoadResource/IfcBoundaryNodeConditionWarping.java b/IfcStructuralLoadResource/IfcBoundaryNodeConditionWarping.java index 14b95648..5f89689c 100644 --- a/IfcStructuralLoadResource/IfcBoundaryNodeConditionWarping.java +++ b/IfcStructuralLoadResource/IfcBoundaryNodeConditionWarping.java @@ -5,6 +5,6 @@ { public class IfcBoundaryNodeConditionWarping extends IfcBoundaryNodeCondition { - private IfcWarpingStiffnessSelect WarpingStiffness; + private double WarpingStiffness; } } diff --git a/IfcStructuralLoadResource/IfcModulusOfRotationalSubgradeReactionSelect.java b/IfcStructuralLoadResource/IfcModulusOfRotationalSubgradeReactionSelect.java deleted file mode 100644 index d881734c..00000000 --- a/IfcStructuralLoadResource/IfcModulusOfRotationalSubgradeReactionSelect.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public interface IfcModulusOfRotationalSubgradeReactionSelect - { - } -} diff --git a/IfcStructuralLoadResource/IfcModulusOfSubgradeReactionSelect.java b/IfcStructuralLoadResource/IfcModulusOfSubgradeReactionSelect.java deleted file mode 100644 index b3614e43..00000000 --- a/IfcStructuralLoadResource/IfcModulusOfSubgradeReactionSelect.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public interface IfcModulusOfSubgradeReactionSelect - { - } -} diff --git a/IfcStructuralLoadResource/IfcModulusOfTranslationalSubgradeReactionSelect.java b/IfcStructuralLoadResource/IfcModulusOfTranslationalSubgradeReactionSelect.java deleted file mode 100644 index 4b19b75d..00000000 --- a/IfcStructuralLoadResource/IfcModulusOfTranslationalSubgradeReactionSelect.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public interface IfcModulusOfTranslationalSubgradeReactionSelect - { - } -} diff --git a/IfcStructuralLoadResource/IfcRotationalStiffnessSelect.java b/IfcStructuralLoadResource/IfcRotationalStiffnessSelect.java deleted file mode 100644 index 92dcaade..00000000 --- a/IfcStructuralLoadResource/IfcRotationalStiffnessSelect.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public interface IfcRotationalStiffnessSelect - { - } -} diff --git a/IfcStructuralLoadResource/IfcStructuralLoadConfiguration.java b/IfcStructuralLoadResource/IfcStructuralLoadConfiguration.java deleted file mode 100644 index 710037c2..00000000 --- a/IfcStructuralLoadResource/IfcStructuralLoadConfiguration.java +++ /dev/null @@ -1,11 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcStructuralLoadConfiguration extends IfcStructuralLoad - { - private IfcStructuralLoadOrResult[] Values; - private double[] Locations; - } -} diff --git a/IfcStructuralLoadResource/IfcStructuralLoadOrResult.java b/IfcStructuralLoadResource/IfcStructuralLoadOrResult.java deleted file mode 100644 index ddd8429f..00000000 --- a/IfcStructuralLoadResource/IfcStructuralLoadOrResult.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcStructuralLoadOrResult extends IfcStructuralLoad - { - } -} diff --git a/IfcStructuralLoadResource/IfcStructuralLoadStatic.java b/IfcStructuralLoadResource/IfcStructuralLoadStatic.java index 47f1fa99..cf05ddcc 100644 --- a/IfcStructuralLoadResource/IfcStructuralLoadStatic.java +++ b/IfcStructuralLoadResource/IfcStructuralLoadStatic.java @@ -3,7 +3,7 @@ package buildingsmart.ifc { - public class IfcStructuralLoadStatic extends IfcStructuralLoadOrResult + public class IfcStructuralLoadStatic extends IfcStructuralLoad { } } diff --git a/IfcStructuralLoadResource/IfcStructuralLoadTemperature.java b/IfcStructuralLoadResource/IfcStructuralLoadTemperature.java index 3604b36a..7b569485 100644 --- a/IfcStructuralLoadResource/IfcStructuralLoadTemperature.java +++ b/IfcStructuralLoadResource/IfcStructuralLoadTemperature.java @@ -5,8 +5,8 @@ { public class IfcStructuralLoadTemperature extends IfcStructuralLoadStatic { - private double DeltaTConstant; - private double DeltaTY; - private double DeltaTZ; + private double DeltaT_Constant; + private double DeltaT_Y; + private double DeltaT_Z; } } diff --git a/IfcStructuralLoadResource/IfcSurfaceReinforcementArea.java b/IfcStructuralLoadResource/IfcSurfaceReinforcementArea.java deleted file mode 100644 index 9b926d9f..00000000 --- a/IfcStructuralLoadResource/IfcSurfaceReinforcementArea.java +++ /dev/null @@ -1,12 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcSurfaceReinforcementArea extends IfcStructuralLoadOrResult - { - private double[] SurfaceReinforcement1; - private double[] SurfaceReinforcement2; - private double ShearReinforcement; - } -} diff --git a/IfcStructuralLoadResource/IfcTranslationalStiffnessSelect.java b/IfcStructuralLoadResource/IfcTranslationalStiffnessSelect.java deleted file mode 100644 index 7463dde6..00000000 --- a/IfcStructuralLoadResource/IfcTranslationalStiffnessSelect.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public interface IfcTranslationalStiffnessSelect - { - } -} diff --git a/IfcStructuralLoadResource/IfcWarpingStiffnessSelect.java b/IfcStructuralLoadResource/IfcWarpingStiffnessSelect.java deleted file mode 100644 index c1b5d5ae..00000000 --- a/IfcStructuralLoadResource/IfcWarpingStiffnessSelect.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public interface IfcWarpingStiffnessSelect - { - } -} diff --git a/IfcTopologyResource/IfcAdvancedFace.java b/IfcTopologyResource/IfcAdvancedFace.java deleted file mode 100644 index 6ed2cd4b..00000000 --- a/IfcTopologyResource/IfcAdvancedFace.java +++ /dev/null @@ -1,9 +0,0 @@ -// This file was automatically generated from IFCDOC at www.buildingsmart-tech.org. -// IFC content is copyright (C) 1996-2013 BuildingSMART International Ltd. - -package buildingsmart.ifc -{ - public class IfcAdvancedFace extends IfcFaceSurface - { - } -} diff --git a/IfcTopologyResource/IfcEdgeCurve.java b/IfcTopologyResource/IfcEdgeCurve.java index e62f93b7..1251757f 100644 --- a/IfcTopologyResource/IfcEdgeCurve.java +++ b/IfcTopologyResource/IfcEdgeCurve.java @@ -6,6 +6,6 @@ public class IfcEdgeCurve extends IfcEdge { private IfcCurve EdgeGeometry; - private bool SameSense; + private BOOLEAN SameSense; } } diff --git a/IfcTopologyResource/IfcEdgeLoop.java b/IfcTopologyResource/IfcEdgeLoop.java index aae2e12f..501eb286 100644 --- a/IfcTopologyResource/IfcEdgeLoop.java +++ b/IfcTopologyResource/IfcEdgeLoop.java @@ -6,6 +6,6 @@ public class IfcEdgeLoop extends IfcLoop { private IfcOrientedEdge[] EdgeList; - private int Ne; + private INTEGER Ne; } } diff --git a/IfcTopologyResource/IfcFace.java b/IfcTopologyResource/IfcFace.java index 76db9a8c..3c5ccfb3 100644 --- a/IfcTopologyResource/IfcFace.java +++ b/IfcTopologyResource/IfcFace.java @@ -6,6 +6,5 @@ public class IfcFace extends IfcTopologicalRepresentationItem { private IfcFaceBound[] Bounds; - private IfcTextureMap[] HasTextureMaps; } } diff --git a/IfcTopologyResource/IfcFaceBound.java b/IfcTopologyResource/IfcFaceBound.java index 2fb2f2b6..d51be323 100644 --- a/IfcTopologyResource/IfcFaceBound.java +++ b/IfcTopologyResource/IfcFaceBound.java @@ -6,6 +6,6 @@ public class IfcFaceBound extends IfcTopologicalRepresentationItem { private IfcLoop Bound; - private bool Orientation; + private BOOLEAN Orientation; } } diff --git a/IfcTopologyResource/IfcFaceSurface.java b/IfcTopologyResource/IfcFaceSurface.java index f62206ec..99fbf70b 100644 --- a/IfcTopologyResource/IfcFaceSurface.java +++ b/IfcTopologyResource/IfcFaceSurface.java @@ -6,6 +6,6 @@ public class IfcFaceSurface extends IfcFace { private IfcSurface FaceSurface; - private bool SameSense; + private BOOLEAN SameSense; } } diff --git a/IfcTopologyResource/IfcOrientedEdge.java b/IfcTopologyResource/IfcOrientedEdge.java index fc67eea5..3f598bd3 100644 --- a/IfcTopologyResource/IfcOrientedEdge.java +++ b/IfcTopologyResource/IfcOrientedEdge.java @@ -6,7 +6,7 @@ public class IfcOrientedEdge extends IfcEdge { private IfcEdge EdgeElement; - private bool Orientation; + private BOOLEAN Orientation; private IfcVertex EdgeStart; private IfcVertex EdgeEnd; } diff --git a/IfcUtilityResource/IfcChangeActionEnum.java b/IfcUtilityResource/IfcChangeActionEnum.java index c2006915..29c7c04d 100644 --- a/IfcUtilityResource/IfcChangeActionEnum.java +++ b/IfcUtilityResource/IfcChangeActionEnum.java @@ -9,6 +9,7 @@ public enum IfcChangeActionEnum MODIFIED, ADDED, DELETED, - NOTDEFINED, + MODIFIEDADDED, + MODIFIEDDELETED, } } diff --git a/IfcUtilityResource/IfcTable.java b/IfcUtilityResource/IfcTable.java index c1c6e12c..2e0df20a 100644 --- a/IfcUtilityResource/IfcTable.java +++ b/IfcUtilityResource/IfcTable.java @@ -5,11 +5,10 @@ { public class IfcTable extends IfcBase { - private string Name; + private STRING Name; private IfcTableRow[] Rows; - private IfcTableColumn[] Columns; - private int NumberOfCellsInRow; - private int NumberOfHeadings; - private int NumberOfDataRows; + private INTEGER NumberOfCellsInRow; + private INTEGER NumberOfHeadings; + private INTEGER NumberOfDataRows; } } diff --git a/IfcUtilityResource/IfcTableRow.java b/IfcUtilityResource/IfcTableRow.java index b61371fb..4e15d66a 100644 --- a/IfcUtilityResource/IfcTableRow.java +++ b/IfcUtilityResource/IfcTableRow.java @@ -6,6 +6,7 @@ public class IfcTableRow extends IfcBase { private IfcValue[] RowCells; - private bool IsHeading; + private BOOLEAN IsHeading; + private IfcTable OfTable; } }