Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2016-10-18 15:30:55 +0000
committerEike Stepper2016-10-18 15:30:55 +0000
commitd271b313d58d5eef02ed687c151a42dfd0c0f0ed (patch)
tree57ca0c57f33f0780f6092613bab565d35f7986af /plugins/org.eclipse.emf.cdo.examples.installer/examples
parent6809f0af826be94b174d4e1a45d75e686813d267 (diff)
downloadcdo-d271b313d58d5eef02ed687c151a42dfd0c0f0ed.tar.gz
cdo-d271b313d58d5eef02ed687c151a42dfd0c0f0ed.tar.xz
cdo-d271b313d58d5eef02ed687c151a42dfd0c0f0ed.zip
[Releng] Increase max line length to 160
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.examples.installer/examples')
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java37
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java23
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java52
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java21
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java150
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java39
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java50
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java24
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java38
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java103
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java26
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java41
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java37
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java206
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs2
64 files changed, 497 insertions, 772 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java
index 1a0ee765cb..438d1dbff6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java
@@ -21,8 +21,7 @@ public class ClientPerspective implements IPerspectiveFactory
public void createInitialLayout(IPageLayout layout)
{
layout.setFixed(true);
- layout.addView("org.eclipse.emf.cdo.examples.client.offline.ClientView", IPageLayout.LEFT, 0.5f,
- IPageLayout.ID_EDITOR_AREA);
+ layout.addView("org.eclipse.emf.cdo.examples.client.offline.ClientView", IPageLayout.LEFT, 0.5f, IPageLayout.ID_EDITOR_AREA);
layout.addView("org.eclipse.emf.cdo.examples.client.offline.CloneRepositoryView", IPageLayout.BOTTOM, 0.46f,
"org.eclipse.emf.cdo.examples.client.offline.ClientView");
layout.addView("org.eclipse.ui.views.PropertySheet", IPageLayout.BOTTOM, 0.67f, IPageLayout.ID_EDITOR_AREA);
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java
index bee2a781be..3b770c51fd 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java
@@ -167,8 +167,8 @@ public class ClientView extends AbstractView<CDOSession>
{
CDOTransaction transaction = Application.NODE.getObject(CDOTransaction.class);
commitAction.setEnabled(transaction != null && transaction.isDirty());
- mergeAction.setEnabled(transaction != null && transaction.getBranch().isLocal()
- && Application.NODE.getObject(IRepository.class).getState() == State.ONLINE);
+ mergeAction
+ .setEnabled(transaction != null && transaction.getBranch().isLocal() && Application.NODE.getObject(IRepository.class).getState() == State.ONLINE);
}
protected void hookContextMenu()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
index f46ef13914..d0d1299e3d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
@@ -109,20 +109,17 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor>
private static final Random RANDOM = new Random();
- private static final int[] BACKGROUND = { 255, 216, 255, 224, 0, 16, 74, 70, 73, 70, 0, 1, 1, 1, 0, 72, 0, 72, 0, 0,
- 255, 254, 0, 19, 67, 114, 101, 97, 116, 101, 100, 32, 119, 105, 116, 104, 32, 71, 73, 77, 80, 255, 219, 0, 67,
- 0, 5, 3, 4, 4, 4, 3, 5, 4, 4, 4, 5, 5, 5, 6, 7, 12, 8, 7, 7, 7, 7, 15, 11, 11, 9, 12, 17, 15, 18, 18, 17, 15,
- 17, 17, 19, 22, 28, 23, 19, 20, 26, 21, 17, 17, 24, 33, 24, 26, 29, 29, 31, 31, 31, 19, 23, 34, 36, 34, 30, 36,
- 28, 30, 31, 30, 255, 219, 0, 67, 1, 5, 5, 5, 7, 6, 7, 14, 8, 8, 14, 30, 20, 17, 20, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 255, 192, 0, 17, 8, 0, 20, 0, 20, 3, 1, 34, 0, 2,
- 17, 1, 3, 17, 1, 255, 196, 0, 23, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 7, 255, 196, 0,
- 34, 16, 0, 2, 2, 0, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 4, 2, 20, 33, 52, 84, 17, 115, 145, 178, 209,
- 97, 255, 196, 0, 23, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 3, 255, 196, 0, 27, 17, 0, 2,
- 2, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 17, 33, 49, 81, 18, 255, 218, 0, 12, 3, 1, 0, 2, 17, 3, 17,
- 0, 63, 0, 225, 37, 87, 118, 245, 59, 79, 217, 140, 212, 60, 24, 60, 226, 250, 83, 110, 196, 74, 10, 205, 211,
- 133, 245, 141, 180, 155, 122, 106, 255, 0, 78, 77, 187, 88, 4, 164, 237, 96, 204, 5, 89, 168, 120, 48, 121, 197,
- 244, 10, 223, 5, 233, 240, 148, 170, 238, 222, 167, 105, 251, 48, 9, 237, 20, 182, 137, 64, 6, 140, 255, 217 };
+ private static final int[] BACKGROUND = { 255, 216, 255, 224, 0, 16, 74, 70, 73, 70, 0, 1, 1, 1, 0, 72, 0, 72, 0, 0, 255, 254, 0, 19, 67, 114, 101, 97, 116,
+ 101, 100, 32, 119, 105, 116, 104, 32, 71, 73, 77, 80, 255, 219, 0, 67, 0, 5, 3, 4, 4, 4, 3, 5, 4, 4, 4, 5, 5, 5, 6, 7, 12, 8, 7, 7, 7, 7, 15, 11, 11, 9,
+ 12, 17, 15, 18, 18, 17, 15, 17, 17, 19, 22, 28, 23, 19, 20, 26, 21, 17, 17, 24, 33, 24, 26, 29, 29, 31, 31, 31, 19, 23, 34, 36, 34, 30, 36, 28, 30, 31,
+ 30, 255, 219, 0, 67, 1, 5, 5, 5, 7, 6, 7, 14, 8, 8, 14, 30, 20, 17, 20, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
+ 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 255, 192, 0, 17, 8, 0, 20, 0,
+ 20, 3, 1, 34, 0, 2, 17, 1, 3, 17, 1, 255, 196, 0, 23, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 7, 255, 196, 0, 34, 16, 0, 2, 2, 0, 5,
+ 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 4, 2, 20, 33, 52, 84, 17, 115, 145, 178, 209, 97, 255, 196, 0, 23, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 2, 0, 1, 3, 255, 196, 0, 27, 17, 0, 2, 2, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 17, 33, 49, 81, 18, 255, 218, 0, 12, 3, 1, 0, 2, 17,
+ 3, 17, 0, 63, 0, 225, 37, 87, 118, 245, 59, 79, 217, 140, 212, 60, 24, 60, 226, 250, 83, 110, 196, 74, 10, 205, 211, 133, 245, 141, 180, 155, 122, 106,
+ 255, 0, 78, 77, 187, 88, 4, 164, 237, 96, 204, 5, 89, 168, 120, 48, 121, 197, 244, 10, 223, 5, 233, 240, 148, 170, 238, 222, 167, 105, 251, 48, 9, 237,
+ 20, 182, 137, 64, 6, 140, 255, 217 };
private SortedMap<String, Channel> channels = new TreeMap<String, Channel>();
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
index c2606a5f67..d6f29f0c90 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
@@ -81,8 +81,7 @@ public class NormalRepositoryView extends AbstractView<IRepository>
protected void initializeToolBar(IToolBarManager toolbarManager)
{
super.initializeToolBar(toolbarManager);
- toolbarManager.add(new Action("Browser",
- ExampleResourceManager.getPluginImageDescriptor(Application.PLUGIN_ID, "icons/Browser.gif"))
+ toolbarManager.add(new Action("Browser", ExampleResourceManager.getPluginImageDescriptor(Application.PLUGIN_ID, "icons/Browser.gif"))
{
@Override
public void run()
@@ -94,8 +93,7 @@ public class NormalRepositoryView extends AbstractView<IRepository>
try
{
- PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser()
- .openURL(new URL("http://localhost:" + port));
+ PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser().openURL(new URL("http://localhost:" + port));
}
catch (Exception ex)
{
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
index b102b18d33..d5870dd987 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
@@ -228,8 +228,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
String browserPort = node.getSetting(BROWSER_PROPERTY);
if (browserPort != null && browserPort.length() != 0)
{
- CDOServerBrowser browser = (CDOServerBrowser)IPluginContainer.INSTANCE
- .getElement("org.eclipse.emf.cdo.server.browsers", "default", browserPort);
+ CDOServerBrowser browser = (CDOServerBrowser)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.server.browsers", "default", browserPort);
node.setObject(CDOServerBrowser.class, browser);
}
}
@@ -775,8 +774,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
}
@Override
- protected CDONet4jSessionConfiguration createSessionConfiguration(String connectorDescription,
- String repositoryName)
+ protected CDONet4jSessionConfiguration createSessionConfiguration(String connectorDescription, String repositoryName)
{
IConnector connector = Net4jUtil.getConnector(IPluginContainer.INSTANCE, "tcp", connectorDescription);
@@ -826,17 +824,15 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
{
super.start(node);
- org.eclipse.emf.cdo.server.net4j.FailoverMonitor monitor = (org.eclipse.emf.cdo.server.net4j.FailoverMonitor)IPluginContainer.INSTANCE
- .getElement(org.eclipse.emf.cdo.server.net4j.FailoverMonitor.PRODUCT_GROUP,
- org.eclipse.emf.cdo.server.net4j.FailoverMonitor.Factory.TYPE, node.getName());
+ org.eclipse.emf.cdo.server.net4j.FailoverMonitor monitor = (org.eclipse.emf.cdo.server.net4j.FailoverMonitor)IPluginContainer.INSTANCE.getElement(
+ org.eclipse.emf.cdo.server.net4j.FailoverMonitor.PRODUCT_GROUP, org.eclipse.emf.cdo.server.net4j.FailoverMonitor.Factory.TYPE, node.getName());
node.setObject(org.eclipse.emf.cdo.server.net4j.FailoverMonitor.class, monitor);
}
@Override
public void stop(Node node)
{
- org.eclipse.emf.cdo.server.net4j.FailoverMonitor monitor = node
- .getObject(org.eclipse.emf.cdo.server.net4j.FailoverMonitor.class);
+ org.eclipse.emf.cdo.server.net4j.FailoverMonitor monitor = node.getObject(org.eclipse.emf.cdo.server.net4j.FailoverMonitor.class);
LifecycleUtil.deactivate(monitor);
super.stop(node);
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
index 25b7a5b1e8..42b3475e22 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
@@ -180,8 +180,7 @@ public abstract class AbstractOfflineExampleServer
else if ("3".equals(command))
{
System.out.println();
- System.out.println(repository.getName() + ": " + repository.getType()
- + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
+ System.out.println(repository.getName() + ": " + repository.getType() + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
}
else if ("0".equals(command))
{
@@ -205,8 +204,7 @@ public abstract class AbstractOfflineExampleServer
protected IAcceptor createAcceptor()
{
- return (IAcceptor)container.getElement("org.eclipse.net4j.acceptors", AbstractOfflineExampleServer.TRANSPORT_TYPE,
- "0.0.0.0:" + port);
+ return (IAcceptor)container.getElement("org.eclipse.net4j.acceptors", AbstractOfflineExampleServer.TRANSPORT_TYPE, "0.0.0.0:" + port);
}
protected void disconnect()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
index 4c20a676fd..f22befc593 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
@@ -48,8 +48,7 @@ public class OfflineExampleClone extends AbstractOfflineExampleServer
@Override
protected IRepository createRepository(IStore store, Map<String, String> props)
{
- IRepositorySynchronizer synchronizer = createRepositorySynchronizer("localhost:" + OfflineExampleUtil.MASTER_PORT,
- OfflineExampleUtil.MASTER_NAME);
+ IRepositorySynchronizer synchronizer = createRepositorySynchronizer("localhost:" + OfflineExampleUtil.MASTER_PORT, OfflineExampleUtil.MASTER_NAME);
return CDOServerUtil.createOfflineClone(name, store, props, synchronizer);
}
@@ -71,8 +70,7 @@ public class OfflineExampleClone extends AbstractOfflineExampleServer
* creates a CDOSessionConfigurationFactory for the offline clone. It instantiates a connection to the master
* repository.
*/
- protected CDOSessionConfigurationFactory createSessionConfigurationFactory(final String connectorDescription,
- final String repositoryName)
+ protected CDOSessionConfigurationFactory createSessionConfigurationFactory(final String connectorDescription, final String repositoryName)
{
return new CDOSessionConfigurationFactory()
{
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs
index 974b3ff926..02375399fc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
index 6c41751fe1..8651e0df4e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
@@ -40,9 +40,8 @@ import java.util.List;
* @since 4.0<!-- end-user-doc -->
* @generated
*/
-public class AddressableItemProvider extends CDOItemProviderAdapter
- implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
- IItemPropertySource, IItemColorProvider, IItemFontProvider
+public class AddressableItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider
{
/**
* This constructs an instance from a factory and a notifier.
@@ -80,12 +79,9 @@ public class AddressableItemProvider extends CDOItemProviderAdapter
*/
protected void addNamePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Addressable_name_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Addressable_name_feature", "_UI_Addressable_type"),
- CompanyPackage.Literals.ADDRESSABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Addressable_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Addressable_name_feature", "_UI_Addressable_type"),
+ CompanyPackage.Literals.ADDRESSABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -95,14 +91,9 @@ public class AddressableItemProvider extends CDOItemProviderAdapter
*/
protected void addStreetPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(
- createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Addressable_street_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Addressable_street_feature",
- "_UI_Addressable_type"),
- CompanyPackage.Literals.ADDRESSABLE__STREET, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Addressable_street_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Addressable_street_feature", "_UI_Addressable_type"),
+ CompanyPackage.Literals.ADDRESSABLE__STREET, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -112,12 +103,9 @@ public class AddressableItemProvider extends CDOItemProviderAdapter
*/
protected void addCityPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Addressable_city_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Addressable_city_feature", "_UI_Addressable_type"),
- CompanyPackage.Literals.ADDRESSABLE__CITY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Addressable_city_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Addressable_city_feature", "_UI_Addressable_type"),
+ CompanyPackage.Literals.ADDRESSABLE__CITY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -149,8 +137,7 @@ public class AddressableItemProvider extends CDOItemProviderAdapter
public String getText(Object object)
{
String label = ((Addressable)object).getName();
- return label == null || label.length() == 0 ? getString("_UI_Addressable_type")
- : getString("_UI_Addressable_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Addressable_type") : getString("_UI_Addressable_type") + " " + label;
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java
index 137fcaa142..d2d2bbb458 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java
@@ -41,9 +41,8 @@ import java.util.List;
*
* @generated
*/
-public class CategoryItemProvider extends CDOItemProviderAdapter
- implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
- IItemPropertySource, IItemColorProvider, IItemFontProvider
+public class CategoryItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider
{
/**
* This constructs an instance from a factory and a notifier.
@@ -79,12 +78,9 @@ public class CategoryItemProvider extends CDOItemProviderAdapter
*/
protected void addNamePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Category_name_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Category_name_feature", "_UI_Category_type"),
- CompanyPackage.Literals.CATEGORY__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Category_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Category_name_feature", "_UI_Category_type"),
+ CompanyPackage.Literals.CATEGORY__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -160,8 +156,7 @@ public class CategoryItemProvider extends CDOItemProviderAdapter
public String getText(Object object)
{
String label = ((Category)object).getName();
- return label == null || label.length() == 0 ? getString("_UI_Category_type")
- : getString("_UI_Category_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Category_type") : getString("_UI_Category_type") + " " + label;
}
/**
@@ -199,11 +194,9 @@ public class CategoryItemProvider extends CDOItemProviderAdapter
{
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(
- createChildParameter(CompanyPackage.Literals.CATEGORY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
+ newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.CATEGORY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
- newChildDescriptors.add(
- createChildParameter(CompanyPackage.Literals.CATEGORY__PRODUCTS, CompanyFactory.eINSTANCE.createProduct()));
+ newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.CATEGORY__PRODUCTS, CompanyFactory.eINSTANCE.createProduct()));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
index 6e3e0933d6..b69dd22fc7 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
@@ -123,8 +123,7 @@ public class CompanyItemProvider extends AddressableItemProvider
public String getText(Object object)
{
String label = ((Company)object).getName();
- return label == null || label.length() == 0 ? getString("_UI_Company_type")
- : getString("_UI_Company_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Company_type") : getString("_UI_Company_type") + " " + label;
}
/**
@@ -162,20 +161,15 @@ public class CompanyItemProvider extends AddressableItemProvider
{
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(
- createChildParameter(CompanyPackage.Literals.COMPANY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
+ newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
- newChildDescriptors.add(
- createChildParameter(CompanyPackage.Literals.COMPANY__SUPPLIERS, CompanyFactory.eINSTANCE.createSupplier()));
+ newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__SUPPLIERS, CompanyFactory.eINSTANCE.createSupplier()));
- newChildDescriptors.add(
- createChildParameter(CompanyPackage.Literals.COMPANY__CUSTOMERS, CompanyFactory.eINSTANCE.createCustomer()));
+ newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__CUSTOMERS, CompanyFactory.eINSTANCE.createCustomer()));
- newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__PURCHASE_ORDERS,
- CompanyFactory.eINSTANCE.createPurchaseOrder()));
+ newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__PURCHASE_ORDERS, CompanyFactory.eINSTANCE.createPurchaseOrder()));
- newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__SALES_ORDERS,
- CompanyFactory.eINSTANCE.createSalesOrder()));
+ newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__SALES_ORDERS, CompanyFactory.eINSTANCE.createSalesOrder()));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
index ca5e9e7931..fdf9523198 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
@@ -70,8 +70,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
- protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
- CompanyEditPlugin.INSTANCE, CompanyPackage.eNS_URI);
+ protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(CompanyEditPlugin.INSTANCE, CompanyPackage.eNS_URI);
/**
* This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
index c8601ddb10..75a08f421e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
@@ -63,11 +63,9 @@ public class CustomerItemProvider extends AddressableItemProvider
*/
protected void addSalesOrdersPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Customer_salesOrders_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Customer_salesOrders_feature", "_UI_Customer_type"),
- CompanyPackage.Literals.CUSTOMER__SALES_ORDERS, true, false, true, null, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Customer_salesOrders_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Customer_salesOrders_feature", "_UI_Customer_type"),
+ CompanyPackage.Literals.CUSTOMER__SALES_ORDERS, true, false, true, null, null, null));
}
/**
@@ -100,8 +98,7 @@ public class CustomerItemProvider extends AddressableItemProvider
public String getText(Object object)
{
String label = ((Customer)object).getName();
- return label == null || label.length() == 0 ? getString("_UI_Customer_type")
- : getString("_UI_Customer_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Customer_type") : getString("_UI_Customer_type") + " " + label;
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java
index ac5119c221..e90aa31f59 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java
@@ -39,9 +39,8 @@ import java.util.List;
*
* @generated
*/
-public class OrderDetailItemProvider extends CDOItemProviderAdapter
- implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
- IItemPropertySource, IItemColorProvider, IItemFontProvider
+public class OrderDetailItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider
{
/**
* This constructs an instance from a factory and a notifier.
@@ -78,11 +77,10 @@ public class OrderDetailItemProvider extends CDOItemProviderAdapter
*/
protected void addProductPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_OrderDetail_product_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_product_feature", "_UI_OrderDetail_type"),
- CompanyPackage.Literals.ORDER_DETAIL__PRODUCT, true, false, true, null, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_OrderDetail_product_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_product_feature", "_UI_OrderDetail_type"),
+ CompanyPackage.Literals.ORDER_DETAIL__PRODUCT, true, false, true, null, null, null));
}
/**
@@ -92,14 +90,9 @@ public class OrderDetailItemProvider extends CDOItemProviderAdapter
*/
protected void addPricePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(
- createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_OrderDetail_price_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature",
- "_UI_OrderDetail_type"),
- CompanyPackage.Literals.ORDER_DETAIL__PRICE, true, false, false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_OrderDetail_price_feature"), getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature", "_UI_OrderDetail_type"),
+ CompanyPackage.Literals.ORDER_DETAIL__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
index d780aa6f6c..04688772b9 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
@@ -39,9 +39,8 @@ import java.util.List;
*
* @generated
*/
-public class OrderItemProvider extends CDOItemProviderAdapter
- implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
- IItemPropertySource, IItemColorProvider, IItemFontProvider
+public class OrderItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+ IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider
{
/**
* This constructs an instance from a factory and a notifier.
@@ -174,8 +173,7 @@ public class OrderItemProvider extends CDOItemProviderAdapter
{
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.ORDER__ORDER_DETAILS,
- CompanyFactory.eINSTANCE.createOrderDetail()));
+ newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.ORDER__ORDER_DETAILS, CompanyFactory.eINSTANCE.createOrderDetail()));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
index c6a00d6a50..d08f5378bb 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
@@ -39,9 +39,8 @@ import java.util.List;
*
* @generated
*/
-public class ProductItemProvider extends CDOItemProviderAdapter
- implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
- IItemPropertySource, IItemColorProvider, IItemFontProvider
+public class ProductItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+ IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider
{
/**
* This constructs an instance from a factory and a notifier.
@@ -81,12 +80,9 @@ public class ProductItemProvider extends CDOItemProviderAdapter
*/
protected void addNamePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Product_name_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
- CompanyPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Product_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
+ CompanyPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -96,11 +92,9 @@ public class ProductItemProvider extends CDOItemProviderAdapter
*/
protected void addOrderDetailsPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Product_orderDetails_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Product_orderDetails_feature", "_UI_Product_type"),
- CompanyPackage.Literals.PRODUCT__ORDER_DETAILS, true, false, true, null, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Product_orderDetails_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_orderDetails_feature", "_UI_Product_type"),
+ CompanyPackage.Literals.PRODUCT__ORDER_DETAILS, true, false, true, null, null, null));
}
/**
@@ -110,12 +104,9 @@ public class ProductItemProvider extends CDOItemProviderAdapter
*/
protected void addVatPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Product_vat_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Product_vat_feature", "_UI_Product_type"),
- CompanyPackage.Literals.PRODUCT__VAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Product_vat_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_vat_feature", "_UI_Product_type"),
+ CompanyPackage.Literals.PRODUCT__VAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -125,12 +116,9 @@ public class ProductItemProvider extends CDOItemProviderAdapter
*/
protected void addDescriptionPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Product_description_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Product_description_feature", "_UI_Product_type"),
- CompanyPackage.Literals.PRODUCT__DESCRIPTION, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Product_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_description_feature", "_UI_Product_type"),
+ CompanyPackage.Literals.PRODUCT__DESCRIPTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -142,12 +130,9 @@ public class ProductItemProvider extends CDOItemProviderAdapter
*/
protected void addPricePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Product_price_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Product_price_feature", "_UI_Product_type"),
- CompanyPackage.Literals.PRODUCT__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Product_price_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_price_feature", "_UI_Product_type"),
+ CompanyPackage.Literals.PRODUCT__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -190,8 +175,7 @@ public class ProductItemProvider extends CDOItemProviderAdapter
public String getText(Object object)
{
String label = ((Product)object).getName();
- return label == null || label.length() == 0 ? getString("_UI_Product_type")
- : getString("_UI_Product_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Product_type") : getString("_UI_Product_type") + " " + label;
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
index 873e0e8e09..8f460dc610 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
@@ -67,14 +67,10 @@ public class PurchaseOrderItemProvider extends OrderItemProvider
*/
protected void addDatePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(
- createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_PurchaseOrder_date_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_date_feature",
- "_UI_PurchaseOrder_type"),
- CompanyPackage.Literals.PURCHASE_ORDER__DATE, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_PurchaseOrder_date_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_date_feature", "_UI_PurchaseOrder_type"),
+ CompanyPackage.Literals.PURCHASE_ORDER__DATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -84,12 +80,10 @@ public class PurchaseOrderItemProvider extends OrderItemProvider
*/
protected void addSupplierPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_PurchaseOrder_supplier_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_supplier_feature",
- "_UI_PurchaseOrder_type"),
- CompanyPackage.Literals.PURCHASE_ORDER__SUPPLIER, true, false, true, null, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_PurchaseOrder_supplier_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_supplier_feature", "_UI_PurchaseOrder_type"),
+ CompanyPackage.Literals.PURCHASE_ORDER__SUPPLIER, true, false, true, null, null, null));
}
/**
@@ -123,8 +117,7 @@ public class PurchaseOrderItemProvider extends OrderItemProvider
{
Date labelValue = ((PurchaseOrder)object).getDate();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ? getString("_UI_PurchaseOrder_type")
- : getString("_UI_PurchaseOrder_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_PurchaseOrder_type") : getString("_UI_PurchaseOrder_type") + " " + label;
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java
index 49898e0000..3e50c7323c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java
@@ -66,12 +66,9 @@ public class SalesOrderItemProvider extends OrderItemProvider
*/
protected void addIdPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_SalesOrder_id_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_id_feature", "_UI_SalesOrder_type"),
- CompanyPackage.Literals.SALES_ORDER__ID, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_SalesOrder_id_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_id_feature", "_UI_SalesOrder_type"),
+ CompanyPackage.Literals.SALES_ORDER__ID, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
@@ -81,11 +78,9 @@ public class SalesOrderItemProvider extends OrderItemProvider
*/
protected void addCustomerPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_SalesOrder_customer_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_customer_feature", "_UI_SalesOrder_type"),
- CompanyPackage.Literals.SALES_ORDER__CUSTOMER, true, false, true, null, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_SalesOrder_customer_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_customer_feature", "_UI_SalesOrder_type"),
+ CompanyPackage.Literals.SALES_ORDER__CUSTOMER, true, false, true, null, null, null));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
index de7b9968e7..7c4c36721c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
@@ -66,11 +66,10 @@ public class SupplierItemProvider extends AddressableItemProvider
*/
protected void addPurchaseOrdersPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Supplier_purchaseOrders_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Supplier_purchaseOrders_feature", "_UI_Supplier_type"),
- CompanyPackage.Literals.SUPPLIER__PURCHASE_ORDERS, true, false, true, null, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Supplier_purchaseOrders_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_Supplier_purchaseOrders_feature", "_UI_Supplier_type"),
+ CompanyPackage.Literals.SUPPLIER__PURCHASE_ORDERS, true, false, true, null, null, null));
}
/**
@@ -80,12 +79,9 @@ public class SupplierItemProvider extends AddressableItemProvider
*/
protected void addPreferredPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Supplier_preferred_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Supplier_preferred_feature", "_UI_Supplier_type"),
- CompanyPackage.Literals.SUPPLIER__PREFERRED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Supplier_preferred_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Supplier_preferred_feature", "_UI_Supplier_type"),
+ CompanyPackage.Literals.SUPPLIER__PREFERRED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
/**
@@ -118,8 +114,7 @@ public class SupplierItemProvider extends AddressableItemProvider
public String getText(Object object)
{
String label = ((Supplier)object).getName();
- return label == null || label.length() == 0 ? getString("_UI_Supplier_type")
- : getString("_UI_Supplier_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Supplier_type") : getString("_UI_Supplier_type") + " " + label;
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs
index 974b3ff926..02375399fc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF
index 24b5c4e7fe..407d7077a4 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.company; singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.examples.company;version="4.0.400",
- org.eclipse.emf.cdo.examples.company.impl;version="4.0.400",
- org.eclipse.emf.cdo.examples.company.util;version="4.0.400",
- org.eclipse.emf.cdo.examples.company.validation;version="4.0.400"
+Export-Package: org.eclipse.emf.cdo.examples.company;version="4.0.500",
+ org.eclipse.emf.cdo.examples.company.impl;version="4.0.500",
+ org.eclipse.emf.cdo.examples.company.util;version="4.0.500",
+ org.eclipse.emf.cdo.examples.company.validation;version="4.0.500"
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java
index f790ffadc4..3b2875b91c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java
@@ -171,8 +171,7 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory
VAT result = VAT.get(initialValue);
if (result == null)
{
- throw new IllegalArgumentException(
- "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+ throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
}
return result;
}
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java
index ec355db211..1fdeca3655 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java
@@ -146,9 +146,8 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
}
// Obtain or create and register package
- CompanyPackageImpl theCompanyPackage = (CompanyPackageImpl)(EPackage.Registry.INSTANCE
- .get(eNS_URI) instanceof CompanyPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
- : new CompanyPackageImpl());
+ CompanyPackageImpl theCompanyPackage = (CompanyPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CompanyPackageImpl
+ ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CompanyPackageImpl());
isInited = true;
@@ -636,98 +635,79 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
salesOrderEClass.getESuperTypes().add(getOrder());
// Initialize classes and features; add operations and parameters
- initEClass(addressableEClass, Addressable.class, "Addressable", IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getAddressable_Name(), ecorePackage.getEString(), "name", null, 0, 1, Addressable.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getAddressable_Street(), ecorePackage.getEString(), "street", null, 0, 1, Addressable.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getAddressable_City(), ecorePackage.getEString(), "city", null, 0, 1, Addressable.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(addressableEClass, Addressable.class, "Addressable", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getAddressable_Name(), ecorePackage.getEString(), "name", null, 0, 1, Addressable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getAddressable_Street(), ecorePackage.getEString(), "street", null, 0, 1, Addressable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getAddressable_City(), ecorePackage.getEString(), "city", null, 0, 1, Addressable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(companyEClass, Company.class, "Company", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
+ initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(supplierEClass, Supplier.class, "Supplier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders",
- null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders", null, 0, -1, Supplier.class, !IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1,
- Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1, Customer.class, !IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1,
- Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getOrderDetail_Product(), getProduct(), getProduct_OrderDetails(), "product", null, 0, 1,
- OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(purchaseOrderEClass, PurchaseOrder.class, "PurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1,
- PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1,
- SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getOrderDetail_Product(), getProduct(), getProduct_OrderDetails(), "product", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(purchaseOrderEClass, PurchaseOrder.class, "PurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getCategory_Products(), getProduct(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
+ initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCategory_Products(), getProduct(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(productEClass, Product.class, "Product", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getProduct_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1,
- Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+ initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getProduct_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1, Product.class, !IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProduct_Vat(), getVAT(), "vat", "vat15", 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getProduct_Vat(), getVAT(), "vat", "vat15", 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getProduct_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product.class,
- IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getProduct_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Product.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProduct_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProduct_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Initialize enums and add enum literals
initEEnum(vatEEnum, org.eclipse.emf.cdo.examples.company.VAT.class, "VAT");
@@ -754,11 +734,9 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
addAnnotation(this, source, new String[] { "value",
"@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.examples.hibernate.server.CDOExampleUUIDHexGenerator\")})" });
addAnnotation(orderEClass, source, new String[] { "value", "@Entity(name=\"BaseOrder\")" });
- addAnnotation(getCategory_Name(), source,
- new String[] { "value", "@Id @GeneratedValue(generator=\"system-uuid\")" });
+ addAnnotation(getCategory_Name(), source, new String[] { "value", "@Id @GeneratedValue(generator=\"system-uuid\")" });
addAnnotation(getProduct_Name(), source, new String[] { "value", "@Id" });
- addAnnotation(getProduct_Vat(), source,
- new String[] { "value", "@Basic(optional=false)\n@Column(nullable=false)" });
+ addAnnotation(getProduct_Vat(), source, new String[] { "value", "@Basic(optional=false)\n@Column(nullable=false)" });
}
} // CompanyPackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
index 6ed5249fed..021323f736 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
* end-user-doc -->
* @generated
*/
-public class BusinessDayItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class BusinessDayItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
@@ -81,12 +81,9 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
*/
protected void addDatePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_BusinessDay_date_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_date_feature", "_UI_BusinessDay_type"),
- BusinessPackage.Literals.BUSINESS_DAY__DATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_BusinessDay_date_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_date_feature", "_UI_BusinessDay_type"),
+ BusinessPackage.Literals.BUSINESS_DAY__DATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -96,11 +93,10 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
*/
protected void addMenuCardPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_BusinessDay_menuCard_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_menuCard_feature", "_UI_BusinessDay_type"),
- BusinessPackage.Literals.BUSINESS_DAY__MENU_CARD, true, false, true, null, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_BusinessDay_menuCard_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_menuCard_feature", "_UI_BusinessDay_type"),
+ BusinessPackage.Literals.BUSINESS_DAY__MENU_CARD, true, false, true, null, null, null));
}
/**
@@ -110,14 +106,9 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
*/
protected void addClosedPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(
- createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_BusinessDay_closed_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_closed_feature",
- "_UI_BusinessDay_type"),
- BusinessPackage.Literals.BUSINESS_DAY__CLOSED, true, false, false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_BusinessDay_closed_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_closed_feature", "_UI_BusinessDay_type"),
+ BusinessPackage.Literals.BUSINESS_DAY__CLOSED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
/**
@@ -233,11 +224,9 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
{
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(
- createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__ORDERS, BusinessFactory.eINSTANCE.createOrder()));
+ newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__ORDERS, BusinessFactory.eINSTANCE.createOrder()));
- newChildDescriptors.add(
- createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__WAITERS, BusinessFactory.eINSTANCE.createWaiter()));
+ newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__WAITERS, BusinessFactory.eINSTANCE.createWaiter()));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
index d551fabc05..6a14a7331c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
@@ -41,8 +41,7 @@ import java.util.Collection;
*
* @generated
*/
-public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory
- implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
+public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
{
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
index 866f1ac584..2fe4c796fb 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
* end-user-doc -->
* @generated
*/
-public class OrderDetailItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class OrderDetailItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
@@ -79,11 +79,10 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
*/
protected void addOfferingPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_OrderDetail_offering_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_offering_feature", "_UI_OrderDetail_type"),
- BusinessPackage.Literals.ORDER_DETAIL__OFFERING, true, false, true, null, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_OrderDetail_offering_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_offering_feature", "_UI_OrderDetail_type"),
+ BusinessPackage.Literals.ORDER_DETAIL__OFFERING, true, false, true, null, null, null));
}
/**
@@ -93,14 +92,10 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
*/
protected void addQuantityPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(
- createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_OrderDetail_quantity_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_quantity_feature",
- "_UI_OrderDetail_type"),
- BusinessPackage.Literals.ORDER_DETAIL__QUANTITY, true, false, false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_OrderDetail_quantity_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_quantity_feature", "_UI_OrderDetail_type"),
+ BusinessPackage.Literals.ORDER_DETAIL__QUANTITY, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
@@ -110,14 +105,9 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
*/
protected void addStatePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(
- createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_OrderDetail_state_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_state_feature",
- "_UI_OrderDetail_type"),
- BusinessPackage.Literals.ORDER_DETAIL__STATE, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_OrderDetail_state_feature"), getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_state_feature", "_UI_OrderDetail_type"),
+ BusinessPackage.Literals.ORDER_DETAIL__STATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -127,14 +117,9 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
*/
protected void addPricePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(
- createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_OrderDetail_price_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature",
- "_UI_OrderDetail_type"),
- BusinessPackage.Literals.ORDER_DETAIL__PRICE, false, false, false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_OrderDetail_price_feature"), getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature", "_UI_OrderDetail_type"),
+ BusinessPackage.Literals.ORDER_DETAIL__PRICE, false, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -177,8 +162,7 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
public String getText(Object object)
{
OrderDetail orderDetail = (OrderDetail)object;
- return orderDetail.getOffering() == null ? getString("_UI_OrderDetail_type")
- : orderDetail.getOffering().getName() + " " + orderDetail.getQuantity();
+ return orderDetail.getOffering() == null ? getString("_UI_OrderDetail_type") : orderDetail.getOffering().getName() + " " + orderDetail.getQuantity();
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
index 57482a3381..0852403b26 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
* end-user-doc -->
* @generated
*/
-public class OrderItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class OrderItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
@@ -79,11 +79,9 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
*/
protected void addTablePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Order_table_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Order_table_feature", "_UI_Order_type"),
- BusinessPackage.Literals.ORDER__TABLE, true, false, true, null, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Order_table_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Order_table_feature", "_UI_Order_type"),
+ BusinessPackage.Literals.ORDER__TABLE, true, false, true, null, null, null));
}
/**
@@ -93,12 +91,9 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
*/
protected void addNumberPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Order_number_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Order_number_feature", "_UI_Order_type"),
- BusinessPackage.Literals.ORDER__NUMBER, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Order_number_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Order_number_feature", "_UI_Order_type"),
+ BusinessPackage.Literals.ORDER__NUMBER, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
@@ -210,8 +205,7 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
{
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.ORDER__ORDER_DETAILS,
- BusinessFactory.eINSTANCE.createOrderDetail()));
+ newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.ORDER__ORDER_DETAILS, BusinessFactory.eINSTANCE.createOrderDetail()));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
index d108c09739..297b2a2095 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
* end-user-doc -->
* @generated
*/
-public class WaiterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class WaiterItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
@@ -79,11 +79,9 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
*/
protected void addTablesPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Waiter_tables_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Waiter_tables_feature", "_UI_Waiter_type"),
- BusinessPackage.Literals.WAITER__TABLES, true, false, true, null, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Waiter_tables_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Waiter_tables_feature", "_UI_Waiter_type"),
+ BusinessPackage.Literals.WAITER__TABLES, true, false, true, null, null, null));
}
/**
@@ -93,11 +91,9 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
*/
protected void addEmployeePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Waiter_employee_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Waiter_employee_feature", "_UI_Waiter_type"),
- BusinessPackage.Literals.WAITER__EMPLOYEE, true, false, true, null, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Waiter_employee_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Waiter_employee_feature", "_UI_Waiter_type"),
+ BusinessPackage.Literals.WAITER__EMPLOYEE, true, false, true, null, null, null));
}
/**
@@ -107,12 +103,9 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
*/
protected void addFromPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Waiter_from_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Waiter_from_feature", "_UI_Waiter_type"),
- BusinessPackage.Literals.WAITER__FROM, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Waiter_from_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Waiter_from_feature", "_UI_Waiter_type"),
+ BusinessPackage.Literals.WAITER__FROM, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -122,12 +115,9 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
*/
protected void addUntilPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Waiter_until_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Waiter_until_feature", "_UI_Waiter_type"),
- BusinessPackage.Literals.WAITER__UNTIL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Waiter_until_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Waiter_until_feature", "_UI_Waiter_type"),
+ BusinessPackage.Literals.WAITER__UNTIL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF
index 51cbd6f9a9..6676b6d2af 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.gastro.business;singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.gastro.business;version="4.0.400",
- org.gastro.business.impl;version="4.0.400",
- org.gastro.business.util;version="4.0.400"
+Export-Package: org.gastro.business;version="4.0.500",
+ org.gastro.business.impl;version="4.0.500",
+ org.gastro.business.util;version="4.0.500"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
index aaf1e9edde..e58356583b 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
@@ -43,8 +43,7 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
{
try
{
- BusinessFactory theBusinessFactory = (BusinessFactory)EPackage.Registry.INSTANCE
- .getEFactory("http://www.gastro.org/business/1.0");
+ BusinessFactory theBusinessFactory = (BusinessFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.gastro.org/business/1.0");
if (theBusinessFactory != null)
{
return theBusinessFactory;
@@ -170,8 +169,7 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
OrderState result = OrderState.get(initialValue);
if (result == null)
{
- throw new IllegalArgumentException(
- "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+ throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
}
return result;
}
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
index 6ccd6762e2..cf449f317a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
@@ -109,9 +109,8 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
}
// Obtain or create and register package
- BusinessPackageImpl theBusinessPackage = (BusinessPackageImpl)(EPackage.Registry.INSTANCE
- .get(eNS_URI) instanceof BusinessPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
- : new BusinessPackageImpl());
+ BusinessPackageImpl theBusinessPackage = (BusinessPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BusinessPackageImpl
+ ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BusinessPackageImpl());
isInited = true;
@@ -435,8 +434,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
setNsURI(eNS_URI);
// Obtain other dependent packages
- InventoryPackage theInventoryPackage = (InventoryPackage)EPackage.Registry.INSTANCE
- .getEPackage(InventoryPackage.eNS_URI);
+ InventoryPackage theInventoryPackage = (InventoryPackage)EPackage.Registry.INSTANCE.getEPackage(InventoryPackage.eNS_URI);
// Create type parameters
@@ -445,64 +443,51 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
// Add supertypes to classes
// Initialize classes and features; add operations and parameters
- initEClass(businessDayEClass, BusinessDay.class, "BusinessDay", !IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getBusinessDay_Date(), ecorePackage.getEDate(), "date", null, 0, 1, BusinessDay.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getBusinessDay_MenuCard(), theInventoryPackage.getMenuCard(), null, "menuCard", null, 1, 1,
- BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getBusinessDay_Orders(), getOrder(), getOrder_BusinessDay(), "orders", null, 0, -1,
- BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getBusinessDay_Waiters(), getWaiter(), getWaiter_BusinessDay(), "waiters", null, 1, -1,
- BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBusinessDay_Closed(), ecorePackage.getEBoolean(), "closed", null, 0, 1, BusinessDay.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(businessDayEClass, BusinessDay.class, "BusinessDay", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getBusinessDay_Date(), ecorePackage.getEDate(), "date", null, 0, 1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getBusinessDay_MenuCard(), theInventoryPackage.getMenuCard(), null, "menuCard", null, 1, 1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getBusinessDay_Orders(), getOrder(), getOrder_BusinessDay(), "orders", null, 0, -1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getBusinessDay_Waiters(), getWaiter(), getWaiter_BusinessDay(), "waiters", null, 1, -1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getBusinessDay_Closed(), ecorePackage.getEBoolean(), "closed", null, 0, 1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getOrder_BusinessDay(), getBusinessDay(), getBusinessDay_Orders(), "businessDay", null, 1, 1,
- Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getOrder_Table(), theInventoryPackage.getTable(), null, "table", null, 1, 1, Order.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 1, -1,
- Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getOrder_Number(), ecorePackage.getEInt(), "number", null, 0, 1, Order.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getOrderDetail_Offering(), theInventoryPackage.getOffering(), null, "offering", null, 1, 1,
- OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getOrderDetail_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, OrderDetail.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getOrderDetail_State(), getOrderState(), "state", null, 0, 1, OrderDetail.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
- IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+ initEReference(getOrder_BusinessDay(), getBusinessDay(), getBusinessDay_Orders(), "businessDay", null, 1, 1, Order.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getOrder_Table(), theInventoryPackage.getTable(), null, "table", null, 1, 1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 1, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getOrder_Number(), ecorePackage.getEInt(), "number", null, 0, 1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getOrderDetail_Offering(), theInventoryPackage.getOffering(), null, "offering", null, 1, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getOrderDetail_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getOrderDetail_State(), getOrderState(), "state", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEClass(waiterEClass, Waiter.class, "Waiter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getWaiter_BusinessDay(), getBusinessDay(), getBusinessDay_Waiters(), "businessDay", null, 0, 1,
- Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getWaiter_Tables(), theInventoryPackage.getTable(), null, "tables", null, 0, -1, Waiter.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getWaiter_Employee(), theInventoryPackage.getEmployee(), null, "employee", null, 1, 1, Waiter.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWaiter_From(), ecorePackage.getEDate(), "from", null, 0, 1, Waiter.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWaiter_Until(), ecorePackage.getEDate(), "until", null, 0, 1, Waiter.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getWaiter_BusinessDay(), getBusinessDay(), getBusinessDay_Waiters(), "businessDay", null, 0, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getWaiter_Tables(), theInventoryPackage.getTable(), null, "tables", null, 0, -1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getWaiter_Employee(), theInventoryPackage.getEmployee(), null, "employee", null, 1, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getWaiter_From(), ecorePackage.getEDate(), "from", null, 0, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getWaiter_Until(), ecorePackage.getEDate(), "until", null, 0, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Initialize enums and add enum literals
initEEnum(orderStateEEnum, OrderState.class, "OrderState");
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
index 84429271f4..74cedd8790 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
*
* @generated
*/
-public class DepartmentItemProvider extends StationItemProvider implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class DepartmentItemProvider extends StationItemProvider
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -168,14 +168,11 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
{
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(
- createChildParameter(InventoryPackage.Literals.DEPARTMENT__RECIPES, InventoryFactory.eINSTANCE.createRecipe()));
+ newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__RECIPES, InventoryFactory.eINSTANCE.createRecipe()));
- newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__EMPLOYEES,
- InventoryFactory.eINSTANCE.createEmployee()));
+ newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__EMPLOYEES, InventoryFactory.eINSTANCE.createEmployee()));
- newChildDescriptors.add(
- createChildParameter(InventoryPackage.Literals.DEPARTMENT__STOCKS, InventoryFactory.eINSTANCE.createStock()));
+ newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__STOCKS, InventoryFactory.eINSTANCE.createStock()));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
index 17739155e6..70d4b36288 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
*
* @generated
*/
-public class EmployeeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class EmployeeItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,12 +76,9 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
*/
protected void addNamePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Employee_name_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Employee_name_feature", "_UI_Employee_type"),
- InventoryPackage.Literals.EMPLOYEE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Employee_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Employee_name_feature", "_UI_Employee_type"),
+ InventoryPackage.Literals.EMPLOYEE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
index 47263a0c6f..80f2dc4505 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
*
* @generated
*/
-public class IngredientItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class IngredientItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -77,11 +77,9 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
*/
protected void addProductPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Ingredient_product_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_product_feature", "_UI_Ingredient_type"),
- InventoryPackage.Literals.INGREDIENT__PRODUCT, true, false, true, null, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Ingredient_product_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_product_feature", "_UI_Ingredient_type"),
+ InventoryPackage.Literals.INGREDIENT__PRODUCT, true, false, true, null, null, null));
}
/**
@@ -91,14 +89,9 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
*/
protected void addQuantityPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(
- createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Ingredient_quantity_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_quantity_feature",
- "_UI_Ingredient_type"),
- InventoryPackage.Literals.INGREDIENT__QUANTITY, true, false, false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Ingredient_quantity_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_quantity_feature", "_UI_Ingredient_type"),
+ InventoryPackage.Literals.INGREDIENT__QUANTITY, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
@@ -143,8 +136,7 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
public String getText(Object object)
{
Ingredient ingredient = (Ingredient)object;
- return ingredient.getProduct() == null ? getString("_UI_Ingredient_type")
- : ingredient.getProduct().getName() + " " + ingredient.getQuantity();
+ return ingredient.getProduct() == null ? getString("_UI_Ingredient_type") : ingredient.getProduct().getName() + " " + ingredient.getQuantity();
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
index 0f878076c1..c6719bb48a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
@@ -41,8 +41,7 @@ import java.util.Collection;
*
* @generated
*/
-public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
- implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
+public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
{
/**
* This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
index 67bf336330..d0165b9976 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
*
* @generated
*/
-public class MenuCardItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class MenuCardItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -78,12 +78,9 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
*/
protected void addTitlePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_MenuCard_title_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_MenuCard_title_feature", "_UI_MenuCard_type"),
- InventoryPackage.Literals.MENU_CARD__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_MenuCard_title_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MenuCard_title_feature", "_UI_MenuCard_type"),
+ InventoryPackage.Literals.MENU_CARD__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -198,8 +195,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
{
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.MENU_CARD__SECTIONS,
- InventoryFactory.eINSTANCE.createSection()));
+ newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.MENU_CARD__SECTIONS, InventoryFactory.eINSTANCE.createSection()));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
index 0aee60e852..ca2307643a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
*
* @generated
*/
-public class OfferingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class OfferingItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -79,11 +79,9 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
*/
protected void addProductPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Offering_product_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Offering_product_feature", "_UI_Offering_type"),
- InventoryPackage.Literals.OFFERING__PRODUCT, true, false, true, null, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Offering_product_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Offering_product_feature", "_UI_Offering_type"),
+ InventoryPackage.Literals.OFFERING__PRODUCT, true, false, true, null, null, null));
}
/**
@@ -93,12 +91,9 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
*/
protected void addNamePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Offering_name_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Offering_name_feature", "_UI_Offering_type"),
- InventoryPackage.Literals.OFFERING__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Offering_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Offering_name_feature", "_UI_Offering_type"),
+ InventoryPackage.Literals.OFFERING__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -108,14 +103,9 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
*/
protected void addDescriptionPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(
- createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Offering_description_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Offering_description_feature",
- "_UI_Offering_type"),
- InventoryPackage.Literals.OFFERING__DESCRIPTION, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Offering_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Offering_description_feature", "_UI_Offering_type"),
+ InventoryPackage.Literals.OFFERING__DESCRIPTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -125,12 +115,9 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
*/
protected void addPricePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Offering_price_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Offering_price_feature", "_UI_Offering_type"),
- InventoryPackage.Literals.OFFERING__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Offering_price_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Offering_price_feature", "_UI_Offering_type"),
+ InventoryPackage.Literals.OFFERING__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
index f676dd3475..cbb9a03ea5 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
*
* @generated
*/
-public class ProductItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class ProductItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,12 +76,9 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
*/
protected void addNamePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Product_name_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
- InventoryPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Product_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
+ InventoryPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
index 99966c527f..72fdd8dcfe 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
*
* @generated
*/
-public class RecipeItemProvider extends ProductItemProvider implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class RecipeItemProvider extends ProductItemProvider
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,12 +76,9 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
*/
protected void addCostPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Recipe_cost_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Recipe_cost_feature", "_UI_Recipe_type"),
- InventoryPackage.Literals.RECIPE__COST, false, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Recipe_cost_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Recipe_cost_feature", "_UI_Recipe_type"),
+ InventoryPackage.Literals.RECIPE__COST, false, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -185,8 +182,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
{
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RECIPE__INGREDIENTS,
- InventoryFactory.eINSTANCE.createIngredient()));
+ newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RECIPE__INGREDIENTS, InventoryFactory.eINSTANCE.createIngredient()));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
index 8df3223e09..ea9b267d36 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
*
* @generated
*/
-public class RestaurantItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class RestaurantItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -79,12 +79,9 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
*/
protected void addNamePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Restaurant_name_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_name_feature", "_UI_Restaurant_type"),
- InventoryPackage.Literals.RESTAURANT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Restaurant_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_name_feature", "_UI_Restaurant_type"),
+ InventoryPackage.Literals.RESTAURANT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -94,11 +91,9 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
*/
protected void addStationsPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Restaurant_stations_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_stations_feature", "_UI_Restaurant_type"),
- InventoryPackage.Literals.RESTAURANT__STATIONS, false, false, false, null, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Restaurant_stations_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_stations_feature", "_UI_Restaurant_type"),
+ InventoryPackage.Literals.RESTAURANT__STATIONS, false, false, false, null, null, null));
}
/**
@@ -217,14 +212,11 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
{
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__DEPARTMENTS,
- InventoryFactory.eINSTANCE.createDepartment()));
+ newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__DEPARTMENTS, InventoryFactory.eINSTANCE.createDepartment()));
- newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__MENU_CARDS,
- InventoryFactory.eINSTANCE.createMenuCard()));
+ newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__MENU_CARDS, InventoryFactory.eINSTANCE.createMenuCard()));
- newChildDescriptors.add(
- createChildParameter(InventoryPackage.Literals.RESTAURANT__TABLES, InventoryFactory.eINSTANCE.createTable()));
+ newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__TABLES, InventoryFactory.eINSTANCE.createTable()));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
index 1bfbce1a21..c48d3351dd 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
*
* @generated
*/
-public class SectionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class SectionItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -79,12 +79,9 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
*/
protected void addTitlePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Section_title_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Section_title_feature", "_UI_Section_type"),
- InventoryPackage.Literals.SECTION__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Section_title_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Section_title_feature", "_UI_Section_type"),
+ InventoryPackage.Literals.SECTION__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -94,12 +91,9 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
*/
protected void addTextPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Section_text_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Section_text_feature", "_UI_Section_type"),
- InventoryPackage.Literals.SECTION__TEXT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Section_text_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Section_text_feature", "_UI_Section_type"),
+ InventoryPackage.Literals.SECTION__TEXT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -215,8 +209,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
{
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.SECTION__OFFERINGS,
- InventoryFactory.eINSTANCE.createOffering()));
+ newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.SECTION__OFFERINGS, InventoryFactory.eINSTANCE.createOffering()));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
index aa36005f76..6eb02eb33d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
*
* @generated
*/
-public class StationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class StationItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,12 +76,9 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
*/
protected void addStationIDPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Station_stationID_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Station_stationID_feature", "_UI_Station_type"),
- InventoryPackage.Literals.STATION__STATION_ID, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Station_stationID_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Station_stationID_feature", "_UI_Station_type"),
+ InventoryPackage.Literals.STATION__STATION_ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
index 30d4d27fcc..9f3e5fc7df 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
*
* @generated
*/
-public class StockItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class StockItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -78,12 +78,9 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
*/
protected void addNamePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Stock_name_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Stock_name_feature", "_UI_Stock_type"),
- InventoryPackage.Literals.STOCK__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Stock_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Stock_name_feature", "_UI_Stock_type"),
+ InventoryPackage.Literals.STOCK__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -198,8 +195,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
{
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.STOCK__PRODUCTS,
- InventoryFactory.eINSTANCE.createStockProduct()));
+ newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.STOCK__PRODUCTS, InventoryFactory.eINSTANCE.createStockProduct()));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
index 2a8f4ff5c8..594c454d98 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
*
* @generated
*/
-public class StockProductItemProvider extends ProductItemProvider implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class StockProductItemProvider extends ProductItemProvider
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,14 +76,9 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
*/
protected void addCostPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(
- createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_StockProduct_cost_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_cost_feature",
- "_UI_StockProduct_type"),
- InventoryPackage.Literals.STOCK_PRODUCT__COST, true, false, false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_StockProduct_cost_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_cost_feature", "_UI_StockProduct_type"),
+ InventoryPackage.Literals.STOCK_PRODUCT__COST, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -93,13 +88,10 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
*/
protected void addAvailablePropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_StockProduct_available_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_available_feature",
- "_UI_StockProduct_type"),
- InventoryPackage.Literals.STOCK_PRODUCT__AVAILABLE, true, false, false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_StockProduct_available_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_available_feature", "_UI_StockProduct_type"),
+ InventoryPackage.Literals.STOCK_PRODUCT__AVAILABLE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
@@ -109,13 +101,10 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
*/
protected void addOrderLimitPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_StockProduct_orderLimit_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_orderLimit_feature",
- "_UI_StockProduct_type"),
- InventoryPackage.Literals.STOCK_PRODUCT__ORDER_LIMIT, true, false, false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_StockProduct_orderLimit_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_orderLimit_feature", "_UI_StockProduct_type"),
+ InventoryPackage.Literals.STOCK_PRODUCT__ORDER_LIMIT, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
index efec05d89c..043ae6cd9c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
*
* @generated
*/
-public class TableItemProvider extends StationItemProvider implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class TableItemProvider extends StationItemProvider
+ implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -74,12 +74,9 @@ public class TableItemProvider extends StationItemProvider implements IEditingDo
*/
protected void addSeatsPropertyDescriptor(Object object)
{
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Table_seats_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Table_seats_feature", "_UI_Table_type"),
- InventoryPackage.Literals.TABLE__SEATS, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Table_seats_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Table_seats_feature", "_UI_Table_type"),
+ InventoryPackage.Literals.TABLE__SEATS, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF
index 3463c7e000..97c6eb6ee6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.gastro.inventory;singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.gastro.inventory;version="4.0.400",
- org.gastro.inventory.impl;version="4.0.400",
- org.gastro.inventory.util;version="4.0.400"
+Export-Package: org.gastro.inventory;version="4.0.500",
+ org.gastro.inventory.impl;version="4.0.500",
+ org.gastro.inventory.util;version="4.0.500"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
index 26f888e90d..bab3335017 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
@@ -49,8 +49,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
{
try
{
- InventoryFactory theInventoryFactory = (InventoryFactory)EPackage.Registry.INSTANCE
- .getEFactory("http://www.gastro.org/inventory/1.0");
+ InventoryFactory theInventoryFactory = (InventoryFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.gastro.org/inventory/1.0");
if (theInventoryFactory != null)
{
return theInventoryFactory;
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
index fdd5ff8c6f..2466c1b3a6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
@@ -178,9 +178,8 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
}
// Obtain or create and register package
- InventoryPackageImpl theInventoryPackage = (InventoryPackageImpl)(EPackage.Registry.INSTANCE
- .get(eNS_URI) instanceof InventoryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
- : new InventoryPackageImpl());
+ InventoryPackageImpl theInventoryPackage = (InventoryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InventoryPackageImpl
+ ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InventoryPackageImpl());
isInited = true;
@@ -865,139 +864,112 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
// Initialize classes and features; add operations and parameters
initEClass(stockEClass, Stock.class, "Stock", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getStock_Products(), getStockProduct(), getStockProduct_Stock(), "products", null, 0, -1,
- Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getStock_Name(), ecorePackage.getEString(), "name", null, 0, 1, Stock.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getStock_Department(), getDepartment(), getDepartment_Stocks(), "department", null, 1, 1,
- Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getStock_Products(), getStockProduct(), getStockProduct_Stock(), "products", null, 0, -1, Stock.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getStock_Name(), ecorePackage.getEString(), "name", null, 0, 1, Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getStock_Department(), getDepartment(), getDepartment_Stocks(), "department", null, 1, 1, Stock.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(productEClass, Product.class, "Product", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
addEOperation(productEClass, ecorePackage.getEFloat(), "getCost", 0, 1, IS_UNIQUE, IS_ORDERED);
- initEClass(stockProductEClass, StockProduct.class, "StockProduct", !IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEReference(getStockProduct_Stock(), getStock(), getStock_Products(), "stock", null, 1, 1, StockProduct.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getStockProduct_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, StockProduct.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getStockProduct_Available(), ecorePackage.getEInt(), "available", null, 0, 1, StockProduct.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getStockProduct_OrderLimit(), ecorePackage.getEInt(), "orderLimit", null, 0, 1, StockProduct.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(stockProductEClass, StockProduct.class, "StockProduct", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getStockProduct_Stock(), getStock(), getStock_Products(), "stock", null, 1, 1, StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getStockProduct_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getStockProduct_Available(), ecorePackage.getEInt(), "available", null, 0, 1, StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getStockProduct_OrderLimit(), ecorePackage.getEInt(), "orderLimit", null, 0, 1, StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(recipeEClass, Recipe.class, "Recipe", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getRecipe_Ingredients(), getIngredient(), getIngredient_Recipe(), "ingredients", null, 0, -1,
- Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getRecipe_Department(), getDepartment(), getDepartment_Recipes(), "department", null, 0, 1,
- Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getRecipe_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, Recipe.class, IS_TRANSIENT,
- IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
- initEClass(ingredientEClass, Ingredient.class, "Ingredient", !IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEReference(getIngredient_Recipe(), getRecipe(), getRecipe_Ingredients(), "recipe", null, 1, 1, Ingredient.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getIngredient_Product(), getProduct(), null, "product", null, 1, 1, Ingredient.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEAttribute(getIngredient_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, Ingredient.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRecipe_Ingredients(), getIngredient(), getIngredient_Recipe(), "ingredients", null, 0, -1, Recipe.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRecipe_Department(), getDepartment(), getDepartment_Recipes(), "department", null, 0, 1, Recipe.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getRecipe_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, Recipe.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+
+ initEClass(ingredientEClass, Ingredient.class, "Ingredient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getIngredient_Recipe(), getRecipe(), getRecipe_Ingredients(), "recipe", null, 1, 1, Ingredient.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getIngredient_Product(), getProduct(), null, "product", null, 1, 1, Ingredient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getIngredient_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, Ingredient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(menuCardEClass, MenuCard.class, "MenuCard", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getMenuCard_Title(), ecorePackage.getEString(), "title", null, 0, 1, MenuCard.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getMenuCard_Restaurant(), getRestaurant(), getRestaurant_MenuCards(), "restaurant", null, 1, 1,
- MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getMenuCard_Sections(), getSection(), getSection_MenuCard(), "sections", null, 1, -1, MenuCard.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
-
- initEClass(restaurantEClass, Restaurant.class, "Restaurant", !IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getRestaurant_Name(), ecorePackage.getEString(), "name", null, 0, 1, Restaurant.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getRestaurant_Departments(), getDepartment(), getDepartment_Restaurant(), "departments", null, 0, -1,
- Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getRestaurant_MenuCards(), getMenuCard(), getMenuCard_Restaurant(), "menuCards", null, 0, -1,
- Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getRestaurant_Tables(), getTable(), getTable_Restaurant(), "tables", null, 0, -1, Restaurant.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getRestaurant_Stations(), getStation(), null, "stations", null, 0, -1, Restaurant.class,
- IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- IS_DERIVED, IS_ORDERED);
-
- initEClass(departmentEClass, Department.class, "Department", !IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEReference(getDepartment_Recipes(), getRecipe(), getRecipe_Department(), "recipes", null, 0, -1,
- Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getDepartment_Restaurant(), getRestaurant(), getRestaurant_Departments(), "restaurant", null, 1, 1,
- Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getDepartment_Employees(), getEmployee(), getEmployee_Department(), "employees", null, 0, -1,
- Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getDepartment_Stocks(), getStock(), getStock_Department(), "stocks", null, 1, -1, Department.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getMenuCard_Title(), ecorePackage.getEString(), "title", null, 0, 1, MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getMenuCard_Restaurant(), getRestaurant(), getRestaurant_MenuCards(), "restaurant", null, 1, 1, MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getMenuCard_Sections(), getSection(), getSection_MenuCard(), "sections", null, 1, -1, MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(restaurantEClass, Restaurant.class, "Restaurant", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getRestaurant_Name(), ecorePackage.getEString(), "name", null, 0, 1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRestaurant_Departments(), getDepartment(), getDepartment_Restaurant(), "departments", null, 0, -1, Restaurant.class, !IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRestaurant_MenuCards(), getMenuCard(), getMenuCard_Restaurant(), "menuCards", null, 0, -1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRestaurant_Tables(), getTable(), getTable_Restaurant(), "tables", null, 0, -1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRestaurant_Stations(), getStation(), null, "stations", null, 0, -1, Restaurant.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE,
+ !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+
+ initEClass(departmentEClass, Department.class, "Department", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getDepartment_Recipes(), getRecipe(), getRecipe_Department(), "recipes", null, 0, -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getDepartment_Restaurant(), getRestaurant(), getRestaurant_Departments(), "restaurant", null, 1, 1, Department.class, !IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getDepartment_Employees(), getEmployee(), getEmployee_Department(), "employees", null, 0, -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getDepartment_Stocks(), getStock(), getStock_Department(), "stocks", null, 1, -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(offeringEClass, Offering.class, "Offering", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getOffering_Product(), getProduct(), null, "product", null, 1, 1, Offering.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEAttribute(getOffering_Name(), ecorePackage.getEString(), "name", null, 0, 1, Offering.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getOffering_Description(), ecorePackage.getEString(), "description", null, 0, 1, Offering.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getOffering_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Offering.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getOffering_Section(), getSection(), getSection_Offerings(), "section", null, 1, 1, Offering.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
+ initEReference(getOffering_Product(), getProduct(), null, "product", null, 1, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+ IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getOffering_Name(), ecorePackage.getEString(), "name", null, 0, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getOffering_Description(), ecorePackage.getEString(), "description", null, 0, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getOffering_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getOffering_Section(), getSection(), getSection_Offerings(), "section", null, 1, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(tableEClass, Table.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getTable_Seats(), ecorePackage.getEInt(), "seats", null, 0, 1, Table.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getTable_Restaurant(), getRestaurant(), getRestaurant_Tables(), "restaurant", null, 1, 1,
- Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTable_Seats(), ecorePackage.getEInt(), "seats", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTable_Restaurant(), getRestaurant(), getRestaurant_Tables(), "restaurant", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(employeeEClass, Employee.class, "Employee", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getEmployee_Department(), getDepartment(), getDepartment_Employees(), "department", null, 0, 1,
- Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getEmployee_Name(), ecorePackage.getEString(), "name", null, 0, 1, Employee.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getEmployee_Department(), getDepartment(), getDepartment_Employees(), "department", null, 0, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getEmployee_Name(), ecorePackage.getEString(), "name", null, 0, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(stationEClass, Station.class, "Station", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getStation_StationID(), ecorePackage.getEString(), "stationID", null, 0, 1, Station.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getStation_StationID(), ecorePackage.getEString(), "stationID", null, 0, 1, Station.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(sectionEClass, Section.class, "Section", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getSection_MenuCard(), getMenuCard(), getMenuCard_Sections(), "menuCard", null, 1, 1, Section.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getSection_Offerings(), getOffering(), getOffering_Section(), "offerings", null, 1, -1,
- Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getSection_Title(), ecorePackage.getEString(), "title", null, 0, 1, Section.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getSection_Text(), ecorePackage.getEString(), "text", null, 0, 1, Section.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getSection_MenuCard(), getMenuCard(), getMenuCard_Sections(), "menuCard", null, 1, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getSection_Offerings(), getOffering(), getOffering_Section(), "offerings", null, 1, -1, Section.class, !IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getSection_Title(), ecorePackage.getEString(), "title", null, 0, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getSection_Text(), ecorePackage.getEString(), "text", null, 0, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Create resource
createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF
index 205b6faf64..4fed648bab 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CDO Electronic Restaurant Example RCP Department
Bundle-SymbolicName: org.gastro.rcp.department; singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
Bundle-Activator: org.gastro.rcp.internal.department.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
Export-Package: com.swtdesigner;version="4.0.300";x-internal:=true,
- org.gastro.rcp.internal.department;version="4.0.400";x-internal:=true
+ org.gastro.rcp.internal.department;version="4.0.500";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java
index 0dbf576886..38b5a5413a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java
@@ -130,8 +130,7 @@ public class OrdersView extends ViewPart
{
public Object execute(OrderDetail orderDetail)
{
- orderDetail
- .setState(orderDetail.getState() == OrderState.ORDERED ? OrderState.SERVED : OrderState.ORDERED);
+ orderDetail.setState(orderDetail.getState() == OrderState.ORDERED ? OrderState.SERVED : OrderState.ORDERED);
return null;
}
});
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

Back to the top