diff --git a/rapla/src/org/rapla/RaplaResources.xml b/rapla/src/org/rapla/RaplaResources.xml
index 3ce0134..722ff26 100644
--- a/rapla/src/org/rapla/RaplaResources.xml
+++ b/rapla/src/org/rapla/RaplaResources.xml
@@ -2759,7 +2759,8 @@ See French text.
Evento
Tapahtuma
-
+
+
Event
Veranstaltung
Événement
@@ -2770,6 +2771,7 @@ See French text.
Evento
Tapahtuma
+
New Event...
Neue Veranstaltung
@@ -2781,6 +2783,7 @@ See French text.
Novo evento
Uusi tapahtuma...
+
eventname
@@ -2828,6 +2831,10 @@ See French text.
Tipo de evento
Tapahtumatyyppi
+
+
+ Sub - Event Type
+
Edit own
eigene bearbeiten
diff --git a/rapla/src/org/rapla/entities/dynamictype/DynamicTypeAnnotations.java b/rapla/src/org/rapla/entities/dynamictype/DynamicTypeAnnotations.java
index 256ab62..bfd3ad5 100644
--- a/rapla/src/org/rapla/entities/dynamictype/DynamicTypeAnnotations.java
+++ b/rapla/src/org/rapla/entities/dynamictype/DynamicTypeAnnotations.java
@@ -12,17 +12,22 @@
*--------------------------------------------------------------------------*/
package org.rapla.entities.dynamictype;
+// This class holds all of strings for the program
public interface DynamicTypeAnnotations
{
String KEY_NAME_FORMAT="nameformat";
String KEY_NAME_FORMAT_PLANNING="nameformat_planning";
String KEY_NAME_FORMAT_EXPORT="nameformat_export";
+ // This section contains strings that are applied to the organization of the calendar
String KEY_CLASSIFICATION_TYPE="classification-type";
String VALUE_CLASSIFICATION_TYPE_RESOURCE="resource";
String VALUE_CLASSIFICATION_TYPE_RESERVATION="reservation";
String VALUE_CLASSIFICATION_TYPE_PERSON="person";
String VALUE_CLASSIFICATION_TYPE_RAPLATYPE="rapla";
+ //Added enhancement, Creates a sub-Event string to be added to the calendar
+ // Our enhancement is added in this section, due to its organizational purposes
+ String VALUE_CLASSIFICATION_TYPE_SUBEVENT="subEvent";
String KEY_COLORS="colors";
String VALUE_COLORS_AUTOMATED = "rapla:automated";
@@ -39,6 +44,9 @@ public interface DynamicTypeAnnotations
String VALUE_TRANSFERED_TO_CLIENT_NEVER = "never";
String KEY_LOCATION="location";
+
+
+
}
diff --git a/rapla/src/org/rapla/gui/internal/MenuFactoryImpl.java b/rapla/src/org/rapla/gui/internal/MenuFactoryImpl.java
index da8faad..24418c2 100644
--- a/rapla/src/org/rapla/gui/internal/MenuFactoryImpl.java
+++ b/rapla/src/org/rapla/gui/internal/MenuFactoryImpl.java
@@ -58,6 +58,9 @@ import org.rapla.gui.toolkit.MenuInterface;
import org.rapla.gui.toolkit.RaplaMenuItem;
import org.rapla.gui.toolkit.RaplaSeparator;
+
+// This class controls most of the functioning in the program
+// This is where we added part of our enhancement
public class MenuFactoryImpl extends RaplaGUIComponent implements MenuFactory
{
public void addReservationWizards( MenuInterface menu, MenuContext context, String afterId ) throws RaplaException
@@ -220,6 +223,7 @@ public class MenuFactoryImpl extends RaplaGUIComponent implements MenuFactory
addAllocatableMenuNew( menu, parent,p, focusedObject);
}
}
+ // This controls what is displayed when you right click the headings on the left side of the calendar
if ( isAdmin() )
{
boolean reservationNodeContext = reservationType || (focusedObject!= null && focusedObject.equals( getString("reservation_type" )));
@@ -237,25 +241,35 @@ public class MenuFactoryImpl extends RaplaGUIComponent implements MenuFactory
{
addUserMenuNew( menu , parent, p);
}
-
+ // Creates the menu tab of the new event and person under the parent type
if (allocatableNodeContext)
{
addTypeMenuNew(menu, DynamicTypeAnnotations.VALUE_CLASSIFICATION_TYPE_RESOURCE,parent, p);
addTypeMenuNew(menu, DynamicTypeAnnotations.VALUE_CLASSIFICATION_TYPE_PERSON,parent, p);
}
+ // Creates the menu tab of the new period under the parent type
if ( periodNodeContext)
{
addPeriodMenuNew( menu , parent, p );
}
+ // Creates the menu tab of the new category under the parent type
if ( categoryNodeContext )
{
addCategoryMenuNew( menu , parent, p, focusedObject );
}
+ // Creates the menu tab of the new event under the parent type
if ( reservationNodeContext)
{
addTypeMenuNew(menu, DynamicTypeAnnotations.VALUE_CLASSIFICATION_TYPE_RESERVATION,parent, p);
}
+
+ //added Enhancement, Creates the menu tab of the new sub-event under the parent type
+ if ( reservationNodeContext)
+ {
+ addTypeMenuNew(menu, DynamicTypeAnnotations.VALUE_CLASSIFICATION_TYPE_SUBEVENT,parent, p);
+ }
+
/*
*/
}