contentTypes) {
+ this.contentTypes = contentTypes;
+ }
+
+ protected void addContentType(final ContentType contentType) {
+ contentTypes.add(contentType);
+ }
+
+ protected void removeContentType(final ContentType contentType) {
+ contentTypes.remove(contentType);
+ }
+
@Override
public int hashCode() {
int hash = super.hashCode();
diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java
index 54ddcac45..7681d0ff5 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java
@@ -18,10 +18,15 @@
*/
package org.librecms.contentsection;
+import org.hibernate.annotations.NamedQueries;
+import org.hibernate.annotations.NamedQuery;
+
import static org.librecms.CmsConstants.*;
import org.libreccm.core.CcmObject;
import org.libreccm.l10n.LocalizedString;
+import org.libreccm.workflow.Workflow;
+import org.librecms.lifecycle.Lifecycle;
import java.io.Serializable;
import java.util.Objects;
@@ -34,14 +39,23 @@ import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
+import javax.persistence.ManyToOne;
import javax.persistence.Table;
/**
+ * The {@code ContentType} entity links a content item with its content section.
+ * It also provides default values for the lifecycle and the workflow.
*
* @author Jens Pelzetter
*/
@Entity
@Table(name = "CONTENT_TYPES", schema = DB_SCHEMA)
+@NamedQueries({
+ @NamedQuery(
+ name = "ContentType.findByContenSection",
+ query = "SELECT c FROM ContentType c "
+ + "WHERE c.contentSection = :contentSection")
+})
public class ContentType extends CcmObject implements Serializable {
private static final long serialVersionUID = -2708659750560382851L;
@@ -49,6 +63,10 @@ public class ContentType extends CcmObject implements Serializable {
@Column(name = "CONTENT_ITEM_CLASS", length = 1024)
private String contentItemClass;
+ @ManyToOne
+ @JoinColumn(name = "CONTENT_SECTION_ID")
+ private ContentSection contentSection;
+
@Embedded
@AssociationOverride(
name = "values",
@@ -78,7 +96,13 @@ public class ContentType extends CcmObject implements Serializable {
@Enumerated(EnumType.STRING)
private ContentItemMode mode;
- //ToDo references for authoring kit etc
+ @ManyToOne
+ @JoinColumn(name = "DEFAULT_LIFECYCLE_ID")
+ private Lifecycle defaultLifecycle;
+
+ @ManyToOne
+ @JoinColumn(name = "DEFAULT_WORKFLOW")
+ private Workflow defaultWorkflow;
public String getContentItemClass() {
return contentItemClass;
@@ -88,6 +112,14 @@ public class ContentType extends CcmObject implements Serializable {
this.contentItemClass = contentItemClass;
}
+ public ContentSection getContentSection() {
+ return contentSection;
+ }
+
+ protected void setContentSection(final ContentSection contentSection) {
+ this.contentSection = contentSection;
+ }
+
public LocalizedString getLabel() {
return label;
}
@@ -128,6 +160,22 @@ public class ContentType extends CcmObject implements Serializable {
this.mode = mode;
}
+ public Lifecycle getDefaultLifecycle() {
+ return defaultLifecycle;
+ }
+
+ protected void setDefaultLifecycle(final Lifecycle defaultLifecycle) {
+ this.defaultLifecycle = defaultLifecycle;
+ }
+
+ public Workflow getDefaultWorkflow() {
+ return defaultWorkflow;
+ }
+
+ protected void setDefaultWorkflow(final Workflow defaultWorkflow) {
+ this.defaultWorkflow = defaultWorkflow;
+ }
+
@Override
public int hashCode() {
int hash = super.hashCode();
diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_0__create_tables.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_0__create_tables.sql
index 8a0e042c2..4f11a89ef 100644
--- a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_0__create_tables.sql
+++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_0__create_tables.sql
@@ -15,11 +15,11 @@
create table CCM_CMS.ARTICLE_TEXTS_AUD (
REV integer not null,
OBJECT_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, OBJECT_ID, LOCALE)
);
create table CCM_CMS.ARTICLES (
@@ -43,11 +43,11 @@
create table CCM_CMS.ASSET_TITLES_AUD (
REV integer not null,
ASSET_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, ASSET_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, ASSET_ID, LOCALE)
);
create table CCM_CMS.ASSETS (
@@ -75,11 +75,11 @@
create table CCM_CMS.ATTACHMENT_LIST_CAPTIONS_AUD (
REV integer not null,
LIST_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, LIST_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, LIST_ID, LOCALE)
);
create table CCM_CMS.ATTACHMENT_LISTS (
@@ -152,11 +152,11 @@
create table CCM_CMS.BINARY_ASSET_DESCRIPTIONS_AUD (
REV integer not null,
ASSET_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, ASSET_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, ASSET_ID, LOCALE)
);
create table CCM_CMS.BINARY_ASSETS (
@@ -188,11 +188,11 @@
create table CCM_CMS.BOOKMARK_DESCRIPTIONS_AUD (
REV integer not null,
ASSET_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, ASSET_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, ASSET_ID, LOCALE)
);
create table CCM_CMS.BOOKMARKS (
@@ -218,11 +218,11 @@
create table CCM_CMS.CONTENT_ITEM_DESCRIPTIONS_AUD (
REV integer not null,
OBJECT_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, OBJECT_ID, LOCALE)
);
create table CCM_CMS.CONTENT_ITEM_NAMES (
@@ -235,11 +235,11 @@
create table CCM_CMS.CONTENT_ITEM_NAMES_AUD (
REV integer not null,
OBJECT_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, OBJECT_ID, LOCALE)
);
create table CCM_CMS.CONTENT_ITEM_TITLES (
@@ -252,11 +252,11 @@
create table CCM_CMS.CONTENT_ITEM_TITLES_AUD (
REV integer not null,
OBJECT_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, OBJECT_ID, LOCALE)
);
create table CCM_CMS.CONTENT_ITEMS (
@@ -316,6 +316,9 @@
DESCENDANTS varchar(1024),
mode varchar(255),
OBJECT_ID bigint not null,
+ CONTENT_SECTION_ID bigint,
+ DEFAULT_LIFECYCLE_ID bigint,
+ DEFAULT_WORKFLOW bigint,
primary key (OBJECT_ID)
);
@@ -338,11 +341,11 @@
create table CCM_CMS.EVENT_COSTS_AUD (
REV integer not null,
OBJECT_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, OBJECT_ID, LOCALE)
);
create table CCM_CMS.EVENT_DATES (
@@ -355,11 +358,11 @@
create table CCM_CMS.EVENT_DATES_AUD (
REV integer not null,
OBJECT_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, OBJECT_ID, LOCALE)
);
create table CCM_CMS.EVENT_LOCATIONS (
@@ -372,11 +375,11 @@
create table CCM_CMS.EVENT_LOCATIONS_AUD (
REV integer not null,
OBJECT_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, OBJECT_ID, LOCALE)
);
create table CCM_CMS.EVENT_MAIN_CONTRIBUTORS (
@@ -389,11 +392,11 @@
create table CCM_CMS.EVENT_MAIN_CONTRIBUTORS_AUD (
REV integer not null,
OBJECT_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, OBJECT_ID, LOCALE)
);
create table CCM_CMS.EVENT_TEXTS (
@@ -406,11 +409,11 @@
create table CCM_CMS.EVENT_TEXTS_AUD (
REV integer not null,
OBJECT_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, OBJECT_ID, LOCALE)
);
create table CCM_CMS.EVENT_TYPES (
@@ -423,11 +426,11 @@
create table CCM_CMS.EVENT_TYPES_AUD (
REV integer not null,
OBJECT_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, OBJECT_ID, LOCALE)
);
create table CCM_CMS.EVENTS (
@@ -542,11 +545,11 @@
create table CCM_CMS.LEGAL_METADATA_RIGHTS_AUD (
REV integer not null,
ASSET_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, ASSET_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, ASSET_ID, LOCALE)
);
create table CCM_CMS.LIFECYCLE_DEFINITION_DESCRIPTIONS (
@@ -625,11 +628,11 @@
create table CCM_CMS.MPA_SECTION_TEXTS_AUD (
REV integer not null,
OBJECT_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, OBJECT_ID, LOCALE)
);
create table CCM_CMS.MPA_SECTION_TITLES (
@@ -642,11 +645,11 @@
create table CCM_CMS.MPA_SECTION_TITLES_AUD (
REV integer not null,
OBJECT_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, OBJECT_ID, LOCALE)
);
create table CCM_CMS.MPA_SUMMARIES (
@@ -659,11 +662,11 @@
create table CCM_CMS.MPA_SUMMARIES_AUD (
REV integer not null,
OBJECT_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, OBJECT_ID, LOCALE)
);
create table CCM_CMS.MULTIPART_ARTICLE_SECTIONS (
@@ -729,11 +732,11 @@
create table CCM_CMS.NEWS_TEXTS_AUD (
REV integer not null,
OBJECT_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, OBJECT_ID, LOCALE)
);
create table CCM_CMS.NOTE_TEXTS (
@@ -746,11 +749,11 @@
create table CCM_CMS.NOTE_TEXTS_AUD (
REV integer not null,
ASSET_ID bigint not null,
- LOCALIZED_VALUE clob not null,
+ LOCALIZED_VALUE clob,
LOCALE varchar(255) not null,
REVTYPE tinyint,
REVEND integer,
- primary key (REV, ASSET_ID, LOCALIZED_VALUE, LOCALE)
+ primary key (REV, ASSET_ID, LOCALE)
);
create table CCM_CMS.NOTES (
@@ -834,7 +837,7 @@
alter table CCM_CMS.ASSETS
add constraint UK_9l2v1u9beyemgjwqx7isbumwh unique (UUID);
- alter table CCM_CMS.ARTICLE_LEADS
+alter table CCM_CMS.ARTICLE_LEADS
add constraint FK4g66u3qtfyepw0f733kuiiaul
foreign key (OBJECT_ID)
references CCM_CMS.WORKFLOW_TASK_TYPES;
@@ -1109,6 +1112,21 @@
foreign key (OBJECT_ID)
references CCM_CMS.CONTENT_TYPES;
+ alter table CCM_CMS.CONTENT_TYPES
+ add constraint FKriohuo8093its1k5rgoc5yrfc
+ foreign key (CONTENT_SECTION_ID)
+ references CCM_CMS.CONTENT_SECTIONS;
+
+ alter table CCM_CMS.CONTENT_TYPES
+ add constraint FKoqvcvktnvt4ncx5k6daqat4u8
+ foreign key (DEFAULT_LIFECYCLE_ID)
+ references CCM_CMS.LIFECYCLES;
+
+ alter table CCM_CMS.CONTENT_TYPES
+ add constraint FKpgeccqsr50xwb268ypmfx0r66
+ foreign key (DEFAULT_WORKFLOW)
+ references CCM_CORE.WORKFLOWS;
+
alter table CCM_CMS.CONTENT_TYPES
add constraint FK96vwsbqfbdg33ujeeawajr0v4
foreign key (OBJECT_ID)
@@ -1558,493 +1576,3 @@
add constraint FKge2x94m1y9tr7mk26ensyn674
foreign key (TASK_ID)
references CCM_CORE.WORKFLOW_USER_TASKS;
-
- alter table CCM_CORE.APPLICATIONS
- add constraint FKatcp9ij6mbkx0nfeig1o6n3lm
- foreign key (OBJECT_ID)
- references CCM_CORE.RESOURCES;
-
- alter table CCM_CORE.ATTACHMENTS
- add constraint FK8ju9hm9baceridp803nislkwb
- foreign key (MESSAGE_ID)
- references CCM_CORE.MESSAGES;
-
- alter table CCM_CORE.CATEGORIES
- add constraint FKrj3marx99nheur4fqanm0ylur
- foreign key (PARENT_CATEGORY_ID)
- references CCM_CORE.CATEGORIES;
-
- alter table CCM_CORE.CATEGORIES
- add constraint FKpm291swli2musd0204phta652
- foreign key (OBJECT_ID)
- references CCM_CORE.CCM_OBJECTS;
-
- alter table CCM_CORE.CATEGORIZATIONS
- add constraint FKejp0ubk034nfq60v1po6srkke
- foreign key (OBJECT_ID)
- references CCM_CORE.CCM_OBJECTS;
-
- alter table CCM_CORE.CATEGORIZATIONS
- add constraint FKoyeipswl876wa6mqwbx0uy83h
- foreign key (CATEGORY_ID)
- references CCM_CORE.CATEGORIES;
-
- alter table CCM_CORE.CATEGORY_DESCRIPTIONS
- add constraint FKhiwjlmh5vkbu3v3vng1la1qum
- foreign key (OBJECT_ID)
- references CCM_CORE.CATEGORIES;
-
- alter table CCM_CORE.CATEGORY_DOMAINS
- add constraint FKf25vi73cji01w8fgo6ow1dgg
- foreign key (ROOT_CATEGORY_ID)
- references CCM_CORE.CATEGORIES;
-
- alter table CCM_CORE.CATEGORY_DOMAINS
- add constraint FK58xpmnvciohkom1c16oua4xha
- foreign key (OBJECT_ID)
- references CCM_CORE.CCM_OBJECTS;
-
- alter table CCM_CORE.CATEGORY_TITLES
- add constraint FKka9bt9f5br0kji5bcjxcmf6ch
- foreign key (OBJECT_ID)
- references CCM_CORE.CATEGORIES;
-
- alter table CCM_CORE.CCM_OBJECTS_AUD
- add constraint FKr00eauutiyvocno8ckx6h9nw6
- foreign key (REV)
- references CCM_CORE.CCM_REVISIONS;
-
- alter table CCM_CORE.CCM_OBJECTS_AUD
- add constraint FKo5s37ctcdny7tmewjwv7705h5
- foreign key (REVEND)
- references CCM_CORE.CCM_REVISIONS;
-
- alter table CCM_CORE.DIGESTS
- add constraint FKc53g09agnye3w1v4euy3e0gsi
- foreign key (FROM_PARTY_ID)
- references CCM_CORE.PARTIES;
-
- alter table CCM_CORE.DIGESTS
- add constraint FK845r9ep6xu6nbt1mvxulwybym
- foreign key (OBJECT_ID)
- references CCM_CORE.CCM_OBJECTS;
-
- alter table CCM_CORE.DOMAIN_DESCRIPTIONS
- add constraint FKn4i2dxgn8cqysa62dds6eih6a
- foreign key (OBJECT_ID)
- references CCM_CORE.CATEGORY_DOMAINS;
-
- alter table CCM_CORE.DOMAIN_OWNERSHIPS
- add constraint FK47nsasr7jrdwlky5gx0u6e9py
- foreign key (domain_OBJECT_ID)
- references CCM_CORE.CATEGORY_DOMAINS;
-
- alter table CCM_CORE.DOMAIN_OWNERSHIPS
- add constraint FK3u4hq6yqau4m419b1xva3xpwq
- foreign key (owner_OBJECT_ID)
- references CCM_CORE.APPLICATIONS;
-
- alter table CCM_CORE.DOMAIN_TITLES
- add constraint FK5p526dsdwn94els6lp5w0hdn4
- foreign key (OBJECT_ID)
- references CCM_CORE.CATEGORY_DOMAINS;
-
- alter table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS
- add constraint FKfh0k9lj3pf4amfc9bbbss0tr1
- foreign key (COMPONENT_ID)
- references CCM_CORE.FORMBUILDER_COMPONENTS;
-
- alter table CCM_CORE.FORMBUILDER_COMPONENTS
- add constraint FKpcpmvyiix023b4g5n4q8nkfca
- foreign key (parentComponent_OBJECT_ID)
- references CCM_CORE.FORMBUILDER_COMPONENTS;
-
- alter table CCM_CORE.FORMBUILDER_COMPONENTS
- add constraint FKt0e0uv00pp1rwhyaltrytghnm
- foreign key (OBJECT_ID)
- references CCM_CORE.CCM_OBJECTS;
-
- alter table CCM_CORE.FORMBUILDER_CONFIRM_EMAIL_LISTENER
- add constraint FK48khrbud3xhi2gvsvnlttd8tg
- foreign key (OBJECT_ID)
- references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
-
- alter table CCM_CORE.FORMBUILDER_CONFIRM_REDIRECT_LISTENERS
- add constraint FKbyjjt2ufendvje2obtge2l7et
- foreign key (OBJECT_ID)
- references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
-
- alter table CCM_CORE.FORMBUILDER_DATA_DRIVEN_SELECTS
- add constraint FK8oriyta1957u7dvbrqk717944
- foreign key (OBJECT_ID)
- references CCM_CORE.FORMBUILDER_WIDGETS;
-
- alter table CCM_CORE.FORMBUILDER_DATA_QUERIES
- add constraint FKhhaxpeddbtmrnjr5o0fopju3a
- foreign key (OBJECT_ID)
- references CCM_CORE.CCM_OBJECTS;
-
- alter table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS
- add constraint FKsmduu1opoiulkeo2gc8v7lsbn
- foreign key (DATA_QUERY_ID)
- references CCM_CORE.FORMBUILDER_DATA_QUERIES;
-
- alter table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES
- add constraint FKju1x82inrw3kguyjuxoetn6gn
- foreign key (DATA_QUERY_ID)
- references CCM_CORE.FORMBUILDER_DATA_QUERIES;
-
- alter table CCM_CORE.FORMBUILDER_FORMSECTIONS
- add constraint FKnfhsgxp4lvigq2pm33pn4afac
- foreign key (OBJECT_ID)
- references CCM_CORE.FORMBUILDER_COMPONENTS;
-
- alter table CCM_CORE.FORMBUILDER_LISTENERS
- add constraint FK33ilyirwoux28yowafgd5xx0o
- foreign key (widget_OBJECT_ID)
- references CCM_CORE.FORMBUILDER_WIDGETS;
-
- alter table CCM_CORE.FORMBUILDER_LISTENERS
- add constraint FKlqm76746nq5yrt8ganm474uu0
- foreign key (OBJECT_ID)
- references CCM_CORE.CCM_OBJECTS;
-
- alter table CCM_CORE.FORMBUILDER_METAOBJECTS
- add constraint FKf963v6u9mw8pwjmasrw51w8dx
- foreign key (OBJECT_ID)
- references CCM_CORE.CCM_OBJECTS;
-
- alter table CCM_CORE.FORMBUILDER_OBJECT_TYPES
- add constraint FKkv337e83rsecf0h3qy8bu7l9w
- foreign key (OBJECT_ID)
- references CCM_CORE.CCM_OBJECTS;
-
- alter table CCM_CORE.FORMBUILDER_OPTION_LABELS
- add constraint FKatlsylsvln6yse55eof6wwkj6
- foreign key (OPTION_ID)
- references CCM_CORE.FORMBUILDER_OPTIONS;
-
- alter table CCM_CORE.FORMBUILDER_OPTIONS
- add constraint FKhe5q71wby9g4i56sotc501h11
- foreign key (OBJECT_ID)
- references CCM_CORE.FORMBUILDER_COMPONENTS;
-
- alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS
- add constraint FKcv3iu04gxjk9c0pn6tl8rqqv3
- foreign key (PROCESS_LISTENER_ID)
- references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
-
- alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES
- add constraint FK8rnyb1m6ij3b9hhmhr7klgd4p
- foreign key (PROCESS_LISTENER_ID)
- references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
-
- alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS
- add constraint FK7uiaeax8qafm82e5k729ms5ku
- foreign key (formSection_OBJECT_ID)
- references CCM_CORE.FORMBUILDER_FORMSECTIONS;
-
- alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS
- add constraint FKbdnloo884qk6gn36jwiqv5rlp
- foreign key (OBJECT_ID)
- references CCM_CORE.CCM_OBJECTS;
-
- alter table CCM_CORE.FORMBUILDER_REMOTE_SERVER_POST_LISTENER
- add constraint FKpajvu9m6fj1enm67a9gcb5ii9
- foreign key (OBJECT_ID)
- references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
-
- alter table CCM_CORE.FORMBUILDER_SIMPLE_EMAIL_LISTENERS
- add constraint FKsn82ktlq0c9ikijyv8k2bfv4f
- foreign key (OBJECT_ID)
- references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
-
- alter table CCM_CORE.FORMBUILDER_TEMPLATE_EMAIL_LISTENERS
- add constraint FK8kjyu72btjsuaaqh4bvd8npns
- foreign key (OBJECT_ID)
- references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
-
- alter table CCM_CORE.FORMBUILDER_WIDGET_LABELS
- add constraint FKb1q9bfshcrkwlj7r8w5jb4y8l
- foreign key (widget_OBJECT_ID)
- references CCM_CORE.FORMBUILDER_WIDGETS;
-
- alter table CCM_CORE.FORMBUILDER_WIDGET_LABELS
- add constraint FKm1huo6ghk9l5o8buku9v8y6q7
- foreign key (OBJECT_ID)
- references CCM_CORE.FORMBUILDER_COMPONENTS;
-
- alter table CCM_CORE.FORMBUILDER_WIDGETS
- add constraint FKs7qq6vxblhmq0rlf87re65jdp
- foreign key (label_OBJECT_ID)
- references CCM_CORE.FORMBUILDER_WIDGET_LABELS;
-
- alter table CCM_CORE.FORMBUILDER_WIDGETS
- add constraint FK1wosr4ujbfckdc50u5fgmrhrk
- foreign key (OBJECT_ID)
- references CCM_CORE.FORMBUILDER_COMPONENTS;
-
- alter table CCM_CORE.FORMBUILDER_XML_EMAIL_LISTENERS
- add constraint FKjie9co03m7ow4ihig5rk7l8oj
- foreign key (OBJECT_ID)
- references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
-
- alter table CCM_CORE.GROUP_MEMBERSHIPS
- add constraint FKq4qnny8ri3eo7eqh4olxco8nk
- foreign key (GROUP_ID)
- references CCM_CORE.GROUPS;
-
- alter table CCM_CORE.GROUP_MEMBERSHIPS
- add constraint FKc8u86ivkhvoiw6ju8b2p365he
- foreign key (MEMBER_ID)
- references CCM_CORE.USERS;
-
- alter table CCM_CORE.GROUPS
- add constraint FK4f61mlqxw0ct6s7wwpi9m0735
- foreign key (PARTY_ID)
- references CCM_CORE.PARTIES;
-
- alter table CCM_CORE.INITS
- add constraint FK3nvvxk10nmq9nfuko8yklqdgc
- foreign key (REQUIRED_BY_ID)
- references CCM_CORE.INITS;
-
- alter table CCM_CORE.LUCENE_DOCUMENTS
- add constraint FK942kl4yff8rdiwr0pjk2a9g8
- foreign key (CREATED_BY_PARTY_ID)
- references CCM_CORE.USERS;
-
- alter table CCM_CORE.LUCENE_DOCUMENTS
- add constraint FKc5rs6afx4p9fidabfqsxr5ble
- foreign key (LAST_MODIFIED_BY)
- references CCM_CORE.USERS;
-
- alter table CCM_CORE.LUCENE_INDEXES
- add constraint FK6gu0yrlviqk07dtb3r02iw43f
- foreign key (HOST_ID)
- references CCM_CORE.HOSTS;
-
- alter table CCM_CORE.MESSAGES
- add constraint FKph10aehmg9f20pn2w4buki97q
- foreign key (IN_REPLY_TO_ID)
- references CCM_CORE.MESSAGES;
-
- alter table CCM_CORE.MESSAGES
- add constraint FKjufsx3c3h538fj35h8hgfnb1p
- foreign key (SENDER_ID)
- references CCM_CORE.USERS;
-
- alter table CCM_CORE.MESSAGES
- add constraint FK6w20ao7scwecd9mfwpun2ddqx
- foreign key (OBJECT_ID)
- references CCM_CORE.CCM_OBJECTS;
-
- alter table CCM_CORE.NOTIFICATIONS
- add constraint FKqk70c1x1dklhty9ju5t4wukd9
- foreign key (DIGEST_ID)
- references CCM_CORE.DIGESTS;
-
- alter table CCM_CORE.NOTIFICATIONS
- add constraint FKtt4fjr2p75og79jxxgd8q8mr
- foreign key (MESSAGE_ID)
- references CCM_CORE.MESSAGES;
-
- alter table CCM_CORE.NOTIFICATIONS
- add constraint FK2vlnma0ox43j0clx8ead08n5s
- foreign key (RECEIVER_ID)
- references CCM_CORE.PARTIES;
-
- alter table CCM_CORE.NOTIFICATIONS
- add constraint FKf423hhiaw1bexpxeh1pnas7qt
- foreign key (OBJECT_ID)
- references CCM_CORE.CCM_OBJECTS;
-
- alter table CCM_CORE.ONE_TIME_AUTH_TOKENS
- add constraint FKtplfuphkiorfkttaewb4wmfjc
- foreign key (USER_ID)
- references CCM_CORE.USERS;
-
- alter table CCM_CORE.PERMISSIONS
- add constraint FKj9di7pawxgtouxmu2k44bj5c4
- foreign key (CREATION_USER_ID)
- references CCM_CORE.USERS;
-
- alter table CCM_CORE.PERMISSIONS
- add constraint FKikx3x0kn9fito23g50v6xbr9f
- foreign key (GRANTEE_ID)
- references CCM_CORE.CCM_ROLES;
-
- alter table CCM_CORE.PERMISSIONS
- add constraint FKkamckexjnffnt8lay9nqeawhm
- foreign key (OBJECT_ID)
- references CCM_CORE.CCM_OBJECTS;
-
- alter table CCM_CORE.PORTALS
- add constraint FK5a2hdrbw03mmgr74vj5nxlpvk
- foreign key (OBJECT_ID)
- references CCM_CORE.RESOURCES;
-
- alter table CCM_CORE.PORTLETS
- add constraint FK9gr5xjt3rx4uhtw7vl6adruol
- foreign key (PORTAL_ID)
- references CCM_CORE.PORTALS;
-
- alter table CCM_CORE.PORTLETS
- add constraint FKjmx9uebt0gwxkw3xv34niy35f
- foreign key (OBJECT_ID)
- references CCM_CORE.RESOURCES;
-
- alter table CCM_CORE.QUEUE_ITEMS
- add constraint FKtgkwfruv9kjdybf46l02da088
- foreign key (MESSAGE_ID)
- references CCM_CORE.MESSAGES;
-
- alter table CCM_CORE.QUEUE_ITEMS
- add constraint FKs9aq1hyxstwmvx7fmfifp4x7r
- foreign key (RECEIVER_ID)
- references CCM_CORE.PARTIES;
-
- alter table CCM_CORE.RESOURCE_DESCRIPTIONS
- add constraint FKk9arvj5u21rv23ce3cav4opqx
- foreign key (OBJECT_ID)
- references CCM_CORE.RESOURCES;
-
- alter table CCM_CORE.RESOURCE_TITLES
- add constraint FKto4p6n2wklljyf7tmuxtmyfe0
- foreign key (OBJECT_ID)
- references CCM_CORE.RESOURCES;
-
- alter table CCM_CORE.RESOURCE_TYPE_DESCRIPTIONS
- add constraint FKckpihjtv23iahbg3imnpbsr2
- foreign key (RESOURCE_TYPE_ID)
- references CCM_CORE.RESOURCE_TYPES;
-
- alter table CCM_CORE.RESOURCES
- add constraint FKbo7ibfgodicn9flv2gfo11g5a
- foreign key (parent_OBJECT_ID)
- references CCM_CORE.RESOURCES;
-
- alter table CCM_CORE.RESOURCES
- add constraint FK262fbwetpjx3k4uuvw24wsiv
- foreign key (resourceType_RESOURCE_TYPE_ID)
- references CCM_CORE.RESOURCE_TYPES;
-
- alter table CCM_CORE.RESOURCES
- add constraint FKbjdf8pm4frth8r06ev2qjm88f
- foreign key (OBJECT_ID)
- references CCM_CORE.CCM_OBJECTS;
-
- alter table CCM_CORE.ROLE_MEMBERSHIPS
- add constraint FK9m88ywi7rcin7b7jrgh53emrq
- foreign key (MEMBER_ID)
- references CCM_CORE.PARTIES;
-
- alter table CCM_CORE.ROLE_MEMBERSHIPS
- add constraint FKcsyogv5m2rgsrmtgnhgkjhfw7
- foreign key (ROLE_ID)
- references CCM_CORE.CCM_ROLES;
-
- alter table CCM_CORE.SETTINGS_ENUM_VALUES
- add constraint FK8mw4p92s0h3h8bmo8saowu32i
- foreign key (ENUM_ID)
- references CCM_CORE.SETTINGS;
-
- alter table CCM_CORE.SETTINGS_L10N_STR_VALUES
- add constraint FK5knjq7cisej0qfx5dw1y93rou
- foreign key (ENTRY_ID)
- references CCM_CORE.SETTINGS;
-
- alter table CCM_CORE.SETTINGS_STRING_LIST
- add constraint FKqeclqa5sf1g53vxs857tpwrus
- foreign key (LIST_ID)
- references CCM_CORE.SETTINGS;
-
- alter table CCM_CORE.TASK_ASSIGNMENTS
- add constraint FKe29uwmvxdmol1fjob3auej4qv
- foreign key (ROLE_ID)
- references CCM_CORE.CCM_ROLES;
-
- alter table CCM_CORE.TASK_ASSIGNMENTS
- add constraint FKc1vovbjg9mp5yegx2fdoutx7u
- foreign key (TASK_ID)
- references CCM_CORE.WORKFLOW_USER_TASKS;
-
- alter table CCM_CORE.THREADS
- add constraint FKsx08mpwvwnw97uwdgjs76q39g
- foreign key (ROOT_ID)
- references CCM_CORE.MESSAGES;
-
- alter table CCM_CORE.THREADS
- add constraint FKp97b1sy1kop07rtapeh5l9fb2
- foreign key (OBJECT_ID)
- references CCM_CORE.CCM_OBJECTS;
-
- alter table CCM_CORE.USER_EMAIL_ADDRESSES
- add constraint FKr900l79erul95seyyccf04ufc
- foreign key (USER_ID)
- references CCM_CORE.USERS;
-
- alter table CCM_CORE.USERS
- add constraint FKosh928q71aonu6l1kurb417r
- foreign key (PARTY_ID)
- references CCM_CORE.PARTIES;
-
- alter table CCM_CORE.WORKFLOW_DESCRIPTIONS
- add constraint FKgx7upkqky82dpxvbs95imfl9l
- foreign key (WORKFLOW_ID)
- references CCM_CORE.WORKFLOWS;
-
- alter table CCM_CORE.WORKFLOW_NAMES
- add constraint FKkxedy9p48avfk45r0bn4uc09i
- foreign key (WORKFLOW_ID)
- references CCM_CORE.WORKFLOWS;
-
- alter table CCM_CORE.WORKFLOW_TASK_COMMENTS
- add constraint FKkfqrf9jdvm7livu5if06w0r5t
- foreign key (TASK_ID)
- references CCM_CORE.WORKFLOW_TASKS;
-
- alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES
- add constraint FK1htp420ki24jaswtcum56iawe
- foreign key (DEPENDENT_TASK_ID)
- references CCM_CORE.WORKFLOW_TASKS;
-
- alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES
- add constraint FK8rbggnp4yjpab8quvvx800ymy
- foreign key (DEPENDS_ON_TASK_ID)
- references CCM_CORE.WORKFLOW_TASKS;
-
- alter table CCM_CORE.WORKFLOW_TASK_LABELS
- add constraint FKf715qud6g9xv2xeb8rrpnv4xs
- foreign key (TASK_ID)
- references CCM_CORE.WORKFLOW_TASKS;
-
- alter table CCM_CORE.WORKFLOW_TASKS
- add constraint FK1693cbc36e4d8gucg8q7sc57e
- foreign key (WORKFLOW_ID)
- references CCM_CORE.WORKFLOWS;
-
- alter table CCM_CORE.WORKFLOW_TASKS_DESCRIPTIONS
- add constraint FK2s2498d2tpojjrtghq7iyaosv
- foreign key (TASK_ID)
- references CCM_CORE.WORKFLOW_TASKS;
-
- alter table CCM_CORE.WORKFLOW_TEMPLATES
- add constraint FK8692vdme4yxnkj1m0k1dw74pk
- foreign key (WORKFLOW_ID)
- references CCM_CORE.WORKFLOWS;
-
- alter table CCM_CORE.WORKFLOW_USER_TASKS
- add constraint FKf09depwj5rgso2dair07vnu33
- foreign key (LOCKING_USER_ID)
- references CCM_CORE.USERS;
-
- alter table CCM_CORE.WORKFLOW_USER_TASKS
- add constraint FK6evo9y34awhdfcyl8gv78qb7f
- foreign key (NOTIFICATION_SENDER)
- references CCM_CORE.USERS;
-
- alter table CCM_CORE.WORKFLOW_USER_TASKS
- add constraint FKefpdf9ojplu7loo31hfm0wl2h
- foreign key (TASK_ID)
- references CCM_CORE.WORKFLOW_TASKS;
\ No newline at end of file
diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_0__create_tables.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_0__create_tables.sql
index 9c1258a28..594d04efd 100644
--- a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_0__create_tables.sql
+++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_0__create_tables.sql
@@ -1,4 +1,5 @@
+
create table CCM_CMS.ARTICLE_LEADS (
OBJECT_ID int8 not null,
LOCALIZED_VALUE text,
@@ -317,6 +318,9 @@
DESCENDANTS varchar(1024),
mode varchar(255),
OBJECT_ID int8 not null,
+ CONTENT_SECTION_ID int8,
+ DEFAULT_LIFECYCLE_ID int8,
+ DEFAULT_WORKFLOW int8,
primary key (OBJECT_ID)
);
@@ -1110,6 +1114,21 @@
foreign key (OBJECT_ID)
references CCM_CMS.CONTENT_TYPES;
+ alter table CCM_CMS.CONTENT_TYPES
+ add constraint FKriohuo8093its1k5rgoc5yrfc
+ foreign key (CONTENT_SECTION_ID)
+ references CCM_CMS.CONTENT_SECTIONS;
+
+ alter table CCM_CMS.CONTENT_TYPES
+ add constraint FKoqvcvktnvt4ncx5k6daqat4u8
+ foreign key (DEFAULT_LIFECYCLE_ID)
+ references CCM_CMS.LIFECYCLES;
+
+ alter table CCM_CMS.CONTENT_TYPES
+ add constraint FKpgeccqsr50xwb268ypmfx0r66
+ foreign key (DEFAULT_WORKFLOW)
+ references CCM_CORE.WORKFLOWS;
+
alter table CCM_CMS.CONTENT_TYPES
add constraint FK96vwsbqfbdg33ujeeawajr0v4
foreign key (OBJECT_ID)
@@ -1558,4 +1577,4 @@
alter table CCM_CMS.WORKFLOW_TASKS
add constraint FKge2x94m1y9tr7mk26ensyn674
foreign key (TASK_ID)
- references CCM_CORE.WORKFLOW_USER_TASKS;
\ No newline at end of file
+ references CCM_CORE.WORKFLOW_USER_TASKS;
diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java
index 6e625d8c2..a03eb9a5e 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java
@@ -30,6 +30,8 @@ import org.libreccm.security.User;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier;
import org.libreccm.web.CcmApplication;
+import org.libreccm.workflow.Workflow;
+import org.librecms.lifecycle.Lifecycle;
import java.util.Arrays;
import java.util.Collection;
@@ -134,6 +136,18 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
final Resource resource2 = new Resource();
resource2.setDisplayName("Resource 2");
+
+ final Lifecycle lifecycle1 = new Lifecycle();
+ lifecycle1.setFinished(true);
+
+ final Lifecycle lifecycle2 = new Lifecycle();
+ lifecycle2.setFinished(false);
+
+ final Workflow workflow1 = new Workflow();
+ workflow1.setWorkflowId(-100);
+
+ final Workflow workflow2 = new Workflow();
+ workflow2.setWorkflowId(-200);
verifier
.withPrefabValues(ContentItem.class, item1, item2)
@@ -146,7 +160,9 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
.withPrefabValues(Group.class, group1, group2)
.withPrefabValues(CcmApplication.class, application1, application2)
.withPrefabValues(Domain.class, domain1, domain2)
- .withPrefabValues(Resource.class, resource1, resource2);
+ .withPrefabValues(Resource.class, resource1, resource2)
+ .withPrefabValues(Lifecycle.class, lifecycle1, lifecycle2)
+ .withPrefabValues(Workflow.class, workflow1, workflow2);
}
/**
diff --git a/ccm-core/src/main/java/com/arsdigita/bebop/Image.java b/ccm-core/src/main/java/com/arsdigita/bebop/Image.java
new file mode 100755
index 000000000..c37d758cd
--- /dev/null
+++ b/ccm-core/src/main/java/com/arsdigita/bebop/Image.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+package com.arsdigita.bebop;
+
+import com.arsdigita.xml.Element;
+
+import com.arsdigita.util.Assert;
+import com.arsdigita.bebop.event.PrintListener;
+import com.arsdigita.bebop.event.PrintEvent;
+
+/**
+ * A simple wrapper class for images.
+ *
+ * @author David Lutterkort
+ * @author Stanislav Freidin
+ *
+ * @version $Id$
+ */
+
+public class Image extends DescriptiveComponent {
+
+ private final String IMAGE_URL = "src";
+ private final String ALT = "alt";
+ private final String HEIGHT = "height";
+ private final String WIDTH = "width";
+ private final String BORDER = "border";
+
+ private PrintListener m_printListener;
+
+ public Image(String imageURL, String alt) {
+ super();
+ setImageURL(imageURL);
+ setAlt(alt);
+ }
+
+ public Image(String imageURL) {
+ this(imageURL, "");
+ }
+
+ /**
+ * Creates a new Image that uses the print listener
+ * to generate output.
+ *
+ * @param l the print listener used to produce output
+ */
+ public Image(PrintListener l) {
+ this("");
+ addPrintListener(l);
+ }
+
+ public void setImageURL(String imageURL) {
+ Assert.isUnlocked(this);
+ setAttribute(IMAGE_URL, imageURL);
+ }
+
+ public void setAlt(String alt) {
+ Assert.isUnlocked(this);
+ setAttribute(ALT, alt);
+ }
+ /**
+ *
+ *
+ * @param height
+ */
+ public void setHeight(String height) {
+ Assert.isUnlocked(this);
+ setAttribute(HEIGHT, height);
+ }
+
+ /**
+ *
+ *
+ * @param width
+ */
+ public void setWidth(String width) {
+ Assert.isUnlocked(this);
+ setAttribute(WIDTH, width);
+ }
+
+ /**
+ *
+ *
+ * @param border
+ */
+ public void setBorder(String border) {
+ Assert.isUnlocked(this);
+ setAttribute(BORDER, border);
+ }
+
+ /**
+ * Adds a print listener. Only one print listener can be set for an
+ * image, since the PrintListener is expected to modify the
+ * target of the PrintEvent.
+ * @param listener the print listener
+ * @throws IllegalArgumentException if listener is null.
+ * @throws IllegalStateException if a print listener has previously been
+ * added.
+ * @pre listener != null */
+ public void addPrintListener(PrintListener listener)
+ throws IllegalStateException, IllegalArgumentException
+ {
+ if ( listener == null ) {
+ throw new IllegalArgumentException
+ ("Argument listener can not be null");
+ }
+ if ( m_printListener != null ) {
+ throw new IllegalStateException
+ ("Too many listeners. Can only have one");
+ }
+ m_printListener = listener;
+ }
+
+ /**
+ * Removes a previously added print listener. If listener is
+ * not the listener that was added with {@link #addPrintListener
+ * addPrintListener}, an IllegalArgumentException will be thrown.
+ * @param listener the listener that was previously added with
+ * addPrintListener
+ * @throws IllegalArgumentException if listener is not the
+ * currently registered print listener or is null.
+ * @pre listener != null
+ */
+ public void removePrintListener(PrintListener listener)
+ throws IllegalArgumentException
+ {
+ if ( listener == null ) {
+ throw new IllegalArgumentException("listener can not be null");
+ }
+ if ( listener != m_printListener ) {
+ throw new IllegalArgumentException
+ ("listener is not registered with this widget");
+ }
+ m_printListener = null;
+ }
+
+ /**
+ * Writes the output to a DOM to be used with the XSLT template
+ * to produce the appropriate output.
+ *
+ * Generates DOM fragment:
+ *
+ * <bebop:image [src=...] [alt=...] [height=...]
+ * [width=...] [border=...]/>
+ *
The {@link #getTotalSize(Paginator, PageState)} method of this
+ * class is called during the generation of page links for a
+ * Paginator component. When using a
+ * Paginator component with a {@link List} or a {@link
+ * Table}, you can achieve greater flexibility in terms of caching and
+ * performance by having the model builder implement this interface.
+ *
+ *
Unlike other model builder classes in Bebop, there is no
+ * PaginationModel class, as this would only be an int.
+ *
+ * @see Paginator
+ *
+ * @author Phong Nguyen
+ * @version $Id$
+ * @since 4.6.10
+ **/
+public interface PaginationModelBuilder {
+
+ // $Change: 44247 $
+ // $Revision$
+ // $DateTime: 2004/08/16 18:10:38 $
+ // $Author$
+
+ /**
+ * Returns the total number of results to paginate.
+ *
+ * @param paginator the Paginator instance that invoked this method
+ * @param state the current page state
+ * @return the total number of results to paginate.
+ **/
+ int getTotalSize(Paginator paginator, PageState state);
+
+ /**
+ * Determines whether the paginator should be visible in the request
+ * represented by state.
+ * This should normally delegate to the isVisible method of the
+ * associated displayed component.
+ *
+ * @return true if the paginator is visible in the request;
+ * false otherwise.
+ *
+ * @param state represents the current request
+ * @return true if the component is visible; false
+ * otherwise.
+ * @pre state != null
+ */
+ boolean isVisible(PageState state);
+
+}
diff --git a/ccm-core/src/main/java/com/arsdigita/bebop/Paginator.java b/ccm-core/src/main/java/com/arsdigita/bebop/Paginator.java
new file mode 100755
index 000000000..8bbac5f16
--- /dev/null
+++ b/ccm-core/src/main/java/com/arsdigita/bebop/Paginator.java
@@ -0,0 +1,518 @@
+/*
+ * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+package com.arsdigita.bebop;
+
+import com.arsdigita.bebop.list.ListModel;
+import com.arsdigita.bebop.list.ListModelBuilder;
+import com.arsdigita.bebop.parameters.IntegerParameter;
+import com.arsdigita.bebop.util.GlobalizationUtil;
+import com.arsdigita.util.LockableImpl;
+import com.arsdigita.xml.Element;
+
+/**
+ * A pagination component used to select different page views from a list of
+ * items.
+ *
+ *
In most cases, this component will be used with either a {@link
+ * List} or a {@link Table}. Here is an example on how to use this pagination
+ * component with a Table:
+ *
+ *
+ * Table myTable = new Table(new myTableModelBuilder(),
+ * new DefaultTableColumnModel());
+ * Paginator pgntr = new Paginator((PaginationModelBuilder) myTable.getModelBuilder(), 10);
+ *
+ * Page p = new Page();
+ * p.add(pgntr);
+ * p.add(myTable);
+ *
+ *
+ * The model builder that is used in
+ * myTable was designed to also implement the {@link PaginationModelBuilder}
+ * interface. With both interfaces being implemented by the same class, it is
+ * much easier to cache the results of operations performed on the {@link com.arsdigita.persistence.DataQuery}
+ * used to generate the results.
+ *
+ *
+ * public class myTableModelBuilder extends LockableImpl
+ * implements TableModelBuilder, PaginatedModelBuilder {
+ *
+ * private RequestLocal m_query;
+ *
+ * public myTableModelBuilder() {
+ * super();
+ * m_query = new RequestLocal();
+ * }
+ *
+ * private getDataQuery(PageState state) {
+ * // returns the DataQuery used to generate rows for the table
+ * }
+ *
+ * public int getTotalSize(Paginator pgntr, PageState state) {
+ * DataQuery query = getDataQuery(state);
+ * query.setRange(new Integer(pgntr.getFirst(state)),
+ * new Integer(pgntr.getLast(state) + 1));
+ * m_query.set(state, query);
+ * return (int) query.size();
+ * }
+ *
+ * public TableModel makeModel(Table table, PageState state) {
+ * return new myTableModel(table, state, (DataQuery) m_query.get(state));
+ * }
+ * }
+ *
+ *
+ * Subclasses that wish to render the page links in a different format will
+ * override the {@link #buildPaginationDisplay()} method. The implementation of
+ * this method must set the selection model used to retrieve the page number by
+ * calling the {@link
+ * #setPageNumSelectionModel(SingleSelectionModel)} method. Aside from changing
+ * the display, this pagination component will hide itself if
+ * {@link PaginationModelBuilder#getTotalSize(Paginator, PageState)} is less
+ * than the page size (i.e., a single page can be used to display the entire
+ * results). This default behavior can be changed by calling {@link #setHiddenIfSinglePage(boolean)}
+ * with
+ * false.
+ *
+ * @see PaginationModelBuilder
+ *
+ * @author Phong Nguyen
+ * @version $Id$
+ * @since 4.6.10
+ *
+ */
+public class Paginator extends SimpleContainer implements Resettable {
+
+ // $Change: 44247 $
+ // $Revision$
+ // $DateTime: 2004/08/16 18:10:38 $
+ // $Author$
+ // The builder which returns the total number of items to
+ // paginate.
+ private PaginationModelBuilder m_builder;
+ // The selection model that returns the selected page number. The
+ // contained ParameterModel should be a StringParameter, since
+ // this is the default for List and Table.
+ private SingleSelectionModel m_pageNumModel;
+ // The selection model that returns the number of items to display
+ // for one page.
+ private SingleSelectionModel m_pageSizeModel;
+ // This is used to determine if this component should be hidden
+ // when there is only a single page to display. Defaults to true.
+ private boolean m_hiddenIfSinglePage;
+ // A label that contains a space, " ". This is used to insert
+ // spaces between the page links from within the list's
+ // generateXML() method.
+ private BoxPanel m_spacePanel;
+ private Label m_space;
+ // defined in List.java
+ private static final String _SELECT_EVENT = "s";
+
+ /**
+ * Constructor.
+ *
+ * @param builder The builder used to retrieve the total number of results
+ * to paginate.
+ * @param defaultPageSize The default number of results to display on each
+ * page.
+ *
+ */
+ public Paginator(PaginationModelBuilder builder, int defaultPageSize) {
+ super();
+
+ m_builder = builder;
+ m_hiddenIfSinglePage = true;
+
+ // Create the selection model which returns the size of one
+ // page and set its default value.
+ IntegerParameter sizeParam = new IntegerParameter("ps");
+ sizeParam.setDefaultValue(new Integer(defaultPageSize));
+ sizeParam.setDefaultOverridesNull(true);
+ m_pageSizeModel = new ParameterSingleSelectionModel(sizeParam);
+
+ // Builds the display for rendering page links, this also sets
+ // the page number selection model.
+ buildPaginationDisplay();
+ }
+
+ /**
+ * Builds the display for rendering the page links. Subclasses can override
+ * this method to provide a different rendering of the page links. If this
+ * is the case, make sure that the {@link
+ * #setPageNumSelectionModel(SingleSelectionModel)} method is called to set
+ * the selection model for retrieving the selected page number.
+ *
+ */
+ protected void buildPaginationDisplay() {
+ PaginatorList list = new PaginatorList(new PageListModelBuilder(this, getPaginationModelBuilder()));
+ setPageNumSelectionModel(list.getSelectionModel());
+
+ // This is used within the list's generateXML() method to
+ // insert spaces between the page links.
+ m_space = new Label(" ", false);
+ m_spacePanel = new BoxPanel(BoxPanel.HORIZONTAL);
+ m_spacePanel.add(m_space);
+
+ BoxPanel display = new BoxPanel(BoxPanel.HORIZONTAL);
+ display.add(new Label(GlobalizationUtil.globalize("bebop.page")));
+ display.add(list);
+ display.add(m_space);
+ add(display);
+ }
+
+ /**
+ * Sets the selection model that is used for returning the selected page
+ * number. Subclasses that override the {@link
+ * #buildPaginationDisplay()} method will need to call this method.
+ *
+ * @param pageNumModel The selection model used for returning the selected
+ * page number.
+ *
+ */
+ protected void setPageNumSelectionModel(SingleSelectionModel pageNumModel) {
+ m_pageNumModel = pageNumModel;
+ }
+
+ /**
+ * Returns the selected page number.
+ *
+ * @param state Represents the current state of the request.
+ * @return The selected page number.
+ *
+ */
+ public int getSelectedPageNum(PageState state) {
+ String pageNum = (String) m_pageNumModel.getSelectedKey(state);
+ if (pageNum == null) {
+ m_pageNumModel.setSelectedKey(state, "1");
+ return 1;
+ }
+ return Integer.parseInt(pageNum);
+ }
+
+ /**
+ * Sets the selected page number.
+ *
+ * @param state Represents the current state of the request.
+ * @param pageNum The number of the page to set as selected.
+ *
+ */
+ public void setSelectedPageNum(PageState state, int pageNum) {
+ m_pageNumModel.setSelectedKey(state, String.valueOf(pageNum));
+ }
+
+ /**
+ * Returns the number of items to display per page.
+ *
+ * @param state Represents the current state of the request.
+ * @return The number of items to display per page.
+ *
+ */
+ public int getPageSize(PageState state) {
+ return ((Integer) m_pageSizeModel.getSelectedKey(state)).intValue();
+ }
+
+ /**
+ * Sets the number of items to display per page.
+ *
+ * @param state Represents the current state of the request.
+ * @param pageSize The number of items to display per page.
+ *
+ */
+ public void setPageSize(PageState state, int pageSize) {
+ m_pageSizeModel.setSelectedKey(state, new Integer(pageSize));
+ }
+
+ /**
+ * This returns the total number of pages that will be displayed by this
+ * paginator.
+ *
+ * @param state The page state
+ */
+ public int getTotalPages(PageState state) {
+ int totalSize = m_builder.getTotalSize(this, state);
+ int pageSize = getPageSize(state);
+ int minSize = totalSize / pageSize;
+ if (minSize * pageSize == totalSize) {
+ return minSize;
+ } else {
+ return minSize + 1;
+ }
+ }
+
+ /**
+ * Returns the number of the first item to display.
+ *
+ * @param state Represents the current state of the request.
+ * @return The number of the first item to display.
+ *
+ */
+ public int getFirst(PageState state) {
+ return ((getSelectedPageNum(state) - 1) * getPageSize(state)) + 1;
+ }
+
+ /**
+ * Returns the number of the last item to display.
+ *
+ * @param state Represents the current state of the request.
+ * @return The number of teh last item to display.
+ *
+ */
+ public int getLast(PageState state) {
+ // NOTE: If the returned integer is used for
+ // DataQuery.setRange(int, int), then it needs to be
+ // incremented by 1.
+ return (getSelectedPageNum(state) * getPageSize(state));
+ }
+
+ /**
+ * Returns the builder that is used to retrieve the total number of items to
+ * paginate.
+ *
+ * @return The builder used to compute the total number of items to
+ * paginate.
+ *
+ */
+ public PaginationModelBuilder getPaginationModelBuilder() {
+ return m_builder;
+ }
+
+ /**
+ * Specifies whether this component is hidden if there is only a single page
+ * of items to display.
+ *
+ * @return Returns
+ * true if this component is hidden when there is only a single
+ * page to view.
+ *
+ */
+ public boolean isHiddenIfSinglePage() {
+ return m_hiddenIfSinglePage;
+ }
+
+ /**
+ * Sets whether or not this component should be hidden if there is only a
+ * single page of items to display.
+ *
+ * @param isHidden By default, this component will be hidden when there is
+ * only a single page to display. Set this to
+ * false if this is not the desired effect.
+ *
+ */
+ public void setHiddenIfSinglePage(boolean isHidden) {
+ m_hiddenIfSinglePage = isHidden;
+ }
+
+ /**
+ * Returns
+ * true if this component is visible. This component will not
+ * be visible if the paginator model builder's isVisible method reports
+ * false. If this component is set to be hidden when there is only a single
+ * page to display, then the total page size returned from the {@link PaginationModelBuilder}
+ * object must be greater than the number of items per page.
+ *
+ * @param state Represents the current state of the request.
+ * @return Returns
+ * true if this component is visible.
+ *
+ * @see #getPageSize(PageState)
+ * @see PaginationModelBuilder#getTotalSize(Paginator, PageState)
+ *
+ */
+ @Override
+ public boolean isVisible(PageState state) {
+ return (super.isVisible(state)
+ && m_builder.isVisible(state)
+ && ((!m_hiddenIfSinglePage)
+ || m_builder.getTotalSize(this, state) > getPageSize(state)));
+ }
+
+ /**
+ * Register the page size selection model.
+ *
+ * @param p The page to register with.
+ *
+ */
+ @Override
+ public void register(Page p) {
+ super.register(p);
+ p.setVisibleDefault(m_spacePanel, false);
+ p.addComponentStateParam(this, m_pageSizeModel.getStateParameter());
+ }
+
+ /**
+ * Resets this component by clearing the selected page.
+ *
+ * @param state Represents the current state of the request.
+ *
+ */
+ public void reset(PageState state) {
+ m_pageNumModel.clearSelection(state);
+ }
+
+ /**
+ * This class was added to provide greater flexibility in displaying the
+ * page links. Links can be displayed in a space separated list to support
+ * wrapping or in a table with a fixed number of page links per row. By
+ * default the page links will be rendered inside a one-cell table. If the
+ * number of page links to display per line is specified, then each page
+ * link will be rendered in it's own cell.
+ *
+ */
+ private class PaginatorList extends List {
+
+ public PaginatorList(ListModelBuilder builder) {
+ super(builder);
+ }
+
+ /**
+ * If the number of page links to display per line is specified then the
+ * generated xml will be similar to that of a Table. Else, it will be
+ * similar to a simple container.
+ *
+ * @param state Represents the current state of the request.
+ * @param parent The element to which to attach the XML.
+ *
+ */
+ @Override
+ public void generateXML(PageState state, Element parent) {
+ if (!this.isVisible(state)) {
+ return;
+ }
+
+ // maybe display the Previous arrow
+ if (getSelectedPageNum(state) > 1) {
+ state.setControlEvent(this, _SELECT_EVENT,
+ Integer.toString(getSelectedPageNum(state) - 1));
+ (new ControlLink(new Label("<"))).generateXML(state, parent);
+ (new Label(" ")).generateXML(state, parent);
+ state.setControlEvent(this, _SELECT_EVENT,
+ Integer.toString(getSelectedPageNum(state) - 1));
+ (new ControlLink(new Label(GlobalizationUtil.globalize("bebop.previous")))).generateXML(state, parent);
+ (new Label(" ")).generateXML(state, parent);
+ }
+
+ ListModel m = getModel(state);
+ Object selKey = getSelectedKey(state);
+ Component c;
+ int i = 0;
+ while (m.next()) {
+ String key = m.getKey();
+ // Converting both keys to String for comparison
+ // since ListModel.getKey returns a String
+ boolean selected = (selKey != null) && (key != null)
+ && selKey.toString().equals(key.toString());
+
+ state.setControlEvent(this, _SELECT_EVENT, m.getKey());
+ c = getCellRenderer().getComponent(this, state, m.getElement(),
+ m.getKey(), i, selected);
+ c.generateXML(state, parent);
+ m_space.generateXML(state, parent);
+ i += 1;
+ }
+
+ // maybe display the next arrow
+ if (getSelectedPageNum(state) < getTotalPages(state)) {
+ state.setControlEvent(this, _SELECT_EVENT,
+ Integer.toString(getSelectedPageNum(state) + 1));
+ (new Label(" ")).generateXML(state, parent);
+ (new ControlLink(new Label(GlobalizationUtil.globalize("bebop.next")))).generateXML(state, parent);
+ (new Label(" ")).generateXML(state, parent);
+ state.setControlEvent(this, _SELECT_EVENT,
+ Integer.toString(getSelectedPageNum(state) + 1));
+ (new ControlLink(new Label(">"))).generateXML(state, parent);
+ }
+
+ state.clearControlEvent();
+ }
+ }
+
+ /**
+ * A list model builder for the pagination list.
+ *
+ */
+ private class PageListModelBuilder extends LockableImpl
+ implements ListModelBuilder {
+
+ Paginator m_paginator;
+ PaginationModelBuilder m_builder;
+
+ public PageListModelBuilder(Paginator paginator,
+ PaginationModelBuilder builder) {
+ super();
+ m_paginator = paginator;
+ m_builder = builder;
+ }
+
+ public ListModel makeModel(List list, PageState state) {
+ return new PageListModel(m_builder.getTotalSize(m_paginator, state),
+ getPageSize(state),
+ getSelectedPageNum(state));
+ }
+ }
+
+ /**
+ * A list model for the pagination list which is used to generate the text
+ * for the page links.
+ *
+ */
+ private class PageListModel extends LockableImpl
+ implements ListModel {
+
+ int m_totalSize;
+ int m_pageSize;
+ int m_pageCount;
+ int m_current;
+
+ public PageListModel(int totalSize, int pageSize, int current) {
+ super();
+ m_totalSize = totalSize;
+ m_pageSize = pageSize;
+ m_pageCount = 0;
+ m_current = current;
+ }
+
+ public boolean next() {
+ if (m_pageCount * m_pageSize < m_totalSize) {
+ m_pageCount += 1;
+ return true;
+ }
+ return false;
+ }
+
+ public Object getElement() {
+ /*
+ * TODO: Remove or relocate this int begin = ((m_pageCount-1) *
+ * m_pageSize) + 1; int end = (m_pageCount) * m_pageSize; if (end >
+ * m_totalSize) { end = m_totalSize; } return "" + begin + "-" +
+ * end;
+ */
+ if (Math.abs(m_current - m_pageCount) <= 5
+ || m_pageCount == 1
+ || m_pageCount * m_pageSize >= m_totalSize) {
+ return Integer.toString(m_pageCount);
+ } else {
+ return ".";
+ }
+ }
+
+ public String getKey() {
+ return Integer.toString(m_pageCount);
+ }
+ }
+}
diff --git a/ccm-core/src/main/java/com/arsdigita/toolbox/ui/ContextBar.java b/ccm-core/src/main/java/com/arsdigita/toolbox/ui/ContextBar.java
new file mode 100755
index 000000000..422cd5f04
--- /dev/null
+++ b/ccm-core/src/main/java/com/arsdigita/toolbox/ui/ContextBar.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+package com.arsdigita.toolbox.ui;
+
+import com.arsdigita.bebop.SimpleComponent;
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.RequestLocal;
+import com.arsdigita.web.URL;
+import com.arsdigita.util.Assert;
+import com.arsdigita.xml.Element;
+import java.util.Iterator;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.log4j.Logger;
+
+/**
+ *
A context bar.
+ *
+ * @author Justin Ross <jross@redhat.com>
+ * @version $Id$
+ */
+public abstract class ContextBar extends SimpleComponent {
+
+ private static final Logger s_log = Logger.getLogger(ContextBar.class);
+
+ private static final RequestLocal s_entries = new RequestLocal() {
+ protected final Object initialValue(final PageState state) {
+ return new ArrayList();
+ }
+ };
+
+ public ContextBar() {
+ super();
+ }
+
+ protected List entries(final PageState state) {
+ return (List) s_entries.get(state);
+ }
+
+ public final void generateXML(final PageState state, final Element parent) {
+ if (isVisible(state)) {
+ final Element nav = parent.newChildElement
+ ("bebop:contextBar", BEBOP_XML_NS);
+
+ for (Iterator iter = entries(state).iterator(); iter.hasNext(); ) {
+ ((Entry) iter.next()).generateXML(state, nav);
+ }
+ }
+ }
+
+ public static final class Entry {
+ private final String m_title;
+ private final String m_href;
+
+ public Entry(final String title, final String href) {
+ super();
+
+ Assert.exists(title, "String title");
+
+ m_title = title;
+ m_href = href;
+ }
+
+ public Entry(final String title, final URL url) {
+ this(title, url.toString());
+ }
+
+ public void generateXML(final PageState state,
+ final Element parent) {
+ final Element elem = parent.newChildElement
+ ("bebop:entry", BEBOP_XML_NS);
+
+ elem.addAttribute("title", m_title);
+ elem.addAttribute("href", m_href);
+ }
+ }
+}
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/CcmObjectSelectionModel.java b/ccm-core/src/main/java/com/arsdigita/ui/CcmObjectSelectionModel.java
index d6867494c..1c5bdd2c7 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/CcmObjectSelectionModel.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/CcmObjectSelectionModel.java
@@ -31,47 +31,47 @@ import org.libreccm.core.CcmObjectRepository;
/**
* @param
- *
+ *
* @author Jens Pelzetter
-
+ *
*/
-public class CcmObjectSelectionModel
- implements SingleSelectionModel{
+public class CcmObjectSelectionModel
+ implements SingleSelectionModel {
private final Class clazz;
private final SingleSelectionModel model;
-
+
public CcmObjectSelectionModel(final LongParameter parameter) {
this(null, parameter);
}
-
+
public CcmObjectSelectionModel(final String parameterName) {
this(null, new LongParameter(parameterName));
}
-
+
// public CcmObjectSelectionModel(final SingleSelectionModel model ) {
// this(null, model);
// }
//
- public CcmObjectSelectionModel(final Class clazz,
+ public CcmObjectSelectionModel(final Class clazz,
final String parameterName) {
this(clazz, new LongParameter(parameterName));
}
-
+
public CcmObjectSelectionModel(final Class clazz,
final LongParameter parameter) {
this(clazz, new ParameterSingleSelectionModel<>(parameter));
}
-
- public CcmObjectSelectionModel(final Class clazz,
+
+ public CcmObjectSelectionModel(final Class clazz,
final SingleSelectionModel model) {
this.clazz = clazz;
this.model = model;
}
-
+
@Override
public boolean isSelected(final PageState state) {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ return model.isSelected(state);
}
@Override
@@ -83,35 +83,34 @@ public class CcmObjectSelectionModel
public void setSelectedKey(final PageState state, final Long key) {
model.setSelectedKey(state, key);
}
-
+
public T getSelectedObject(final PageState state) {
final Long key = getSelectedKey(state);
final CcmObjectRepository repository = CdiUtil.createCdiUtil().findBean(
CcmObjectRepository.class);
- //final T object = repository.findById(key);
- throw new UnsupportedOperationException();
+ @SuppressWarnings("unchecked")
+ final T object = (T) repository.findById(key);
+ return object;
}
@Override
- public void clearSelection(PageState state) {
+ public void clearSelection(final PageState state) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
- public void addChangeListener(ChangeListener changeListener) {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ public void addChangeListener(final ChangeListener changeListener) {
+ model.addChangeListener(changeListener);
}
@Override
- public void removeChangeListener(ChangeListener changeListener) {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ public void removeChangeListener(final ChangeListener changeListener) {
+ model.addChangeListener(changeListener);;
}
@Override
public ParameterModel getStateParameter() {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ return model.getStateParameter();
}
-
-
-
+
}
diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmCore.java b/ccm-core/src/main/java/org/libreccm/core/CcmCore.java
index 0474a90e1..41c8d0006 100644
--- a/ccm-core/src/main/java/org/libreccm/core/CcmCore.java
+++ b/ccm-core/src/main/java/org/libreccm/core/CcmCore.java
@@ -22,8 +22,6 @@ import com.arsdigita.ui.admin.applications.AdminApplicationCreator;
import com.arsdigita.ui.admin.AdminServlet;
import com.arsdigita.ui.admin.AdminUiConstants;
import com.arsdigita.ui.admin.applications.AdminApplicationSetup;
-import com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm;
-import com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane;
import com.arsdigita.ui.login.LoginApplicationCreator;
import com.arsdigita.ui.login.LoginServlet;
import com.arsdigita.ui.login.LoginApplicationSetup;
diff --git a/ccm-core/src/main/java/org/libreccm/web/ApplicationRepository.java b/ccm-core/src/main/java/org/libreccm/web/ApplicationRepository.java
index cd52ccfd1..82a3f61b6 100644
--- a/ccm-core/src/main/java/org/libreccm/web/ApplicationRepository.java
+++ b/ccm-core/src/main/java/org/libreccm/web/ApplicationRepository.java
@@ -80,7 +80,7 @@ public class ApplicationRepository
@Transactional(Transactional.TxType.REQUIRED)
public List findByType(final String type) {
final TypedQuery query = getEntityManager()
- .createNamedQuery("CcmApplication.Application.findByType",
+ .createNamedQuery("CcmApplication.findByType",
CcmApplication.class);
query.setParameter("type", type);
diff --git a/ccm-core/src/main/java/org/libreccm/web/CcmApplication.java b/ccm-core/src/main/java/org/libreccm/web/CcmApplication.java
index b68379590..55807a739 100644
--- a/ccm-core/src/main/java/org/libreccm/web/CcmApplication.java
+++ b/ccm-core/src/main/java/org/libreccm/web/CcmApplication.java
@@ -57,7 +57,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@NamedQuery(name = "CcmApplication.retrieveApplicationForPath",
query = "SELECT a FROM CcmApplication a "
+ "WHERE a.primaryUrl = :path"),
- @NamedQuery(name = "CcmApplication.Application.findByType",
+ @NamedQuery(name = "CcmApplication.findByType",
query = "SELECT A FROM CcmApplication a "
+ "WHERE a.applicationType = :type")
})