Permalink
Browse files

Merge branch 'master' into bogdan_jwic_mobile

# Conflicts:
#	.gitignore
#	pom.xml
  • Loading branch information...
Otto
Otto committed Dec 2, 2015
2 parents d62fe5b + 2d8160e commit 76ed7be200193acde396e68101b90e7a50ee6d47
Showing 565 changed files with 8,012 additions and 4,576 deletions.
View
@@ -24,3 +24,4 @@ logs/
sessions/
*/_dist/*
*/bin/*
+de.jwic.samples/web_root/WEB-INF/jwicweb.log.?
@@ -3,7 +3,7 @@
<parent>
<groupId>de.xwic.jwic</groupId>
<artifactId>jwic</artifactId>
- <version>5.2.10-SNAPSHOT</version>
+ <version>5.2.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>JWIC::COMPATIBILITY</name>
@@ -23,12 +23,12 @@
<dependency>
<groupId>de.xwic.jwic</groupId>
<artifactId>jwic-core</artifactId>
- <version>5.2.10-SNAPSHOT</version>
+ <version>5.2.12-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>de.xwic.jwic</groupId>
<artifactId>jwic-controls</artifactId>
- <version>5.2.10-SNAPSHOT</version>
+ <version>5.2.12-SNAPSHOT</version>
</dependency>
<!-- General dependencies -->
@@ -69,7 +69,7 @@
<dependency>
<groupId>de.xwic.jwic</groupId>
<artifactId>jwic-core</artifactId>
- <version>5.2.10-SNAPSHOT</version>
+ <version>5.2.12-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1,3 +1,19 @@
+/*******************************************************************************
+ * Copyright 2015 xWic group (http://www.xwic.de)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *******************************************************************************/
/*
* de.jwic.controls.TabStripControl
* $Id: ActionBarControl.java,v 1.2 2010/02/23 08:27:25 lordsam Exp $
@@ -1,19 +1,19 @@
-/*
- * Copyright 2005-2013 jWic group (http://www.jwic.de)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+/*******************************************************************************
+ * Copyright 2015 xWic group (http://www.xwic.de)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
* limitations under the License.
- *
- */
+ *
+ *******************************************************************************/
package de.jwic.controls;
@@ -1,3 +1,19 @@
+/*******************************************************************************
+ * Copyright 2015 xWic group (http://www.xwic.de)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *******************************************************************************/
/*
* de.jwic.controls.ButtonControl
* $Id: ButtonControl.java,v 1.2 2010/02/08 21:09:50 lordsam Exp $
@@ -1,20 +1,19 @@
-/*
- * Copyright 2005-2013 jWic group (http://www.jwic.de)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+/*******************************************************************************
+ * Copyright 2015 xWic group (http://www.xwic.de)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
* limitations under the License.
- *
- * de.jwic.controls.CheckboxControl
- */
+ *
+ *******************************************************************************/
package de.jwic.controls;
import de.jwic.base.IControlContainer;
@@ -1,21 +1,19 @@
-/*
- * Copyright 2005 jWic group (http://www.jwic.de)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+/*******************************************************************************
+ * Copyright 2015 xWic group (http://www.xwic.de)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
* limitations under the License.
- *
- * de.jwic.controls.DateInputBoxControl
- * $Id: DateInputBoxControl.java,v 1.7 2011/07/12 16:07:12 adrianionescu12 Exp $
- */
+ *
+ *******************************************************************************/
package de.jwic.controls;
import java.text.DateFormat;
@@ -1,22 +1,19 @@
-/*
- * Copyright 2005-2007 jWic group (http://www.jwic.de)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+/*******************************************************************************
+ * Copyright 2015 xWic group (http://www.xwic.de)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
* limitations under the License.
- *
- * de.jwic.controls.Window
- * Created on 16.09.2008
- * $Id: InlineWindow.java,v 1.2 2010/01/10 19:54:49 lordsam Exp $
- */
+ *
+ *******************************************************************************/
package de.jwic.controls;
import de.jwic.base.Control;
@@ -1,20 +1,19 @@
-/*
- * Copyright 2005-2013 jWic group (http://www.jwic.de)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+/*******************************************************************************
+ * Copyright 2015 xWic group (http://www.xwic.de)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
* limitations under the License.
- *
- * de.jwic.controls.InputBoxControl
- */
+ *
+ *******************************************************************************/
package de.jwic.controls;
import de.jwic.base.IControlContainer;
@@ -1,31 +1,30 @@
-/*
- * Copyright 2005 jWic group (http://www.jwic.de)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+/*******************************************************************************
+ * Copyright 2015 xWic group (http://www.xwic.de)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
* limitations under the License.
- *
- * de.jwic.controls.LabelControl
- * $Id: LabelControl.java,v 1.5 2010/01/10 19:54:49 lordsam Exp $
- */package de.jwic.controls;
+ *
+ *******************************************************************************/
+package de.jwic.controls;
import java.util.HashMap;
import java.util.Map;
import de.jwic.base.IControlContainer;
/**
- * Represents a label that displays just text. A style can be specified
- * to format the label.
- * @author Florian Lippisch
+ * @author dotto
+ * @date Jul 6, 2015
+ *
*/
public class LabelControl extends HTMLElement {
@@ -1,3 +1,19 @@
+/*******************************************************************************
+ * Copyright 2015 xWic group (http://www.xwic.de)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *******************************************************************************/
/*
* Created on 07.11.2004
*/
@@ -1,3 +1,19 @@
+/*******************************************************************************
+ * Copyright 2015 xWic group (http://www.xwic.de)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *******************************************************************************/
/*
* de.jwic.controls.ListBoxControl
* $Id: ListControl.java,v 1.11 2008/09/17 15:19:46 lordsam Exp $
@@ -1,22 +1,19 @@
-/*
- * Copyright 2005 jWic group (http://www.jwic.de)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+/*******************************************************************************
+ * Copyright 2015 xWic group (http://www.xwic.de)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
* limitations under the License.
- *
- * de.jwic.controls.ProgressBarControl
- * Created on 16.11.2005
- * $Id: ProgressBarControl.java,v 1.3 2011/06/06 12:13:54 lordsam Exp $
- */
+ *
+ *******************************************************************************/
package de.jwic.controls;
import de.jwic.async.IProgressMonitor;
@@ -1,3 +1,19 @@
+/*******************************************************************************
+ * Copyright 2015 xWic group (http://www.xwic.de)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *******************************************************************************/
/*
* de.jwic.controls.RadioGroupControl
* Created on 03.11.2004
@@ -1,7 +1,19 @@
-/*
- * Copyright 2005 jWic Group (http://www.jwic.de)
- * $Id: SubFrameControl.java,v 1.1 2006/01/16 08:31:12 lordsam Exp $
- */
+/*******************************************************************************
+ * Copyright 2015 xWic group (http://www.xwic.de)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *******************************************************************************/
package de.jwic.controls;
import de.jwic.base.ControlContainer;
Oops, something went wrong.

0 comments on commit 76ed7be

Please sign in to comment.