Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update/partial rewrite of editable-grid #756

Merged
merged 22 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
4db722f
Recreated and cleaned up EditableDataTable with new functionalities
silasporth Oct 16, 2023
e027b2c
Replaced tabs with spaces and added @Serial annotation
silasporth Oct 18, 2023
e548050
Added missing wicket ids in html
silasporth Oct 18, 2023
1be23ba
Improved and redesigned Toolbars, added Javadoc comments
silasporth Oct 18, 2023
ea08c3b
Updated DataProviders and added Javadoc comments
silasporth Oct 19, 2023
31f101e
Merge branch 'wicketstuff:master' into master
silasporth Oct 19, 2023
97b2fb1
Fix file names
silasporth Oct 24, 2023
45a0c93
Reworked all columns, added new ones and wrote many Javadoc comments
silasporth Oct 25, 2023
26c3ab9
Cleaned up EditableTableSubmitLink and fixed form behaviors
silasporth Oct 26, 2023
9392e54
Added css classes
silasporth Oct 26, 2023
51f04b6
Changed @see and @link to full links
silasporth Oct 26, 2023
b32de86
Changed @see and @link to full links in DropDownColumn and EditableTa…
silasporth Oct 26, 2023
e66ca37
Renamed toolbars and added NoRecordsToolbar
silasporth Oct 26, 2023
d17b49c
Fix Toolbars Ajax
silasporth Oct 26, 2023
1c63fdd
Made the EditableGrid more accessible
silasporth Oct 26, 2023
4aba1f5
Fix Warning about getString() in Constructors
silasporth Oct 26, 2023
b278fe2
Removed RequiredCheckBoxColumn.java because it doesn't make any sense
silasporth Oct 26, 2023
9ea33c9
Expanded Example
silasporth Oct 26, 2023
ba3e1fe
Changed visibility to protected
silasporth Oct 26, 2023
70b9d66
Regarding commit 203c60a6a61cc4f6590859a4caa5d2cbd7c84713
silasporth Oct 26, 2023
9dbcdf1
Removed inline styles
silasporth Oct 27, 2023
660a8ab
Removed versions in pom.xml and clarified slf4j is only for testing
silasporth Oct 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 32 additions & 13 deletions editable-grid-parent/editable-grid-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,31 @@
<groupId>${project.groupId}</groupId>
<artifactId>wicketstuff-editable-grid</artifactId>
</dependency>

<!-- LOGGING DEPENDENCIES - SLF4J-SIMPLE FOR TESTING -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>

<!-- JUNIT DEPENDENCY FOR TESTING -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>

<!-- JETTY DEPENDENCIES FOR TESTING -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -60,19 +85,13 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<connectors>
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>8080</port>
<maxIdleTime>3600000</maxIdleTime>
</connector>
<connector implementation="org.eclipse.jetty.server.ssl.SslSocketConnector">
<port>8443</port>
<maxIdleTime>3600000</maxIdleTime>
<keystore>${project.build.directory}/test-classes/keystore</keystore>
<password>wicket</password>
<keyPassword>wicket</keyPassword>
</connector>
</connectors>
<systemProperties>
<systemProperty>
<name>maven.project.build.directory.test-classes</name>
<value>${project.build.directory}/test-classes</value>
</systemProperty>
</systemProperties>
<jettyXml>${project.basedir}/src/test/jetty/jetty.xml,${project.basedir}/src/test/jetty/jetty-ssl.xml,${project.basedir}/src/test/jetty/jetty-http.xml,${project.basedir}/src/test/jetty/jetty-https.xml</jettyXml>
</configuration>
</plugin>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
package org.wicketstuff.egrid;

import org.apache.wicket.csp.CSPDirective;
import org.apache.wicket.csp.CSPDirectiveSrcValue;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.WebApplication;
import org.wicketstuff.egrid.page.HomePage;

/**
* Application object for your web application. If you want to run this application without deploying, run the Start class.
*
* @see com.nadeem.app.grid.Start#main(String[])
*
* @see org.wicketstuff.egrid.Start#main(String[])
*/
public class WicketApplication extends WebApplication
{
/**
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
public Class<? extends WebPage> getHomePage()
{
return HomePage.class;
}
public class WicketApplication extends WebApplication {
/**
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
public Class<? extends WebPage> getHomePage() {
return HomePage.class;
}

/**
* @see org.apache.wicket.Application#init()
*/
@Override
public void init()
{
super.init();
getMarkupSettings().setStripWicketTags(true);
// add your configuration here
}
/**
* @see org.apache.wicket.Application#init()
*/
@Override
public void init() {
super.init();
getCspSettings().blocking().disabled();
getMarkupSettings().setStripWicketTags(true);
}
}
Original file line number Diff line number Diff line change
@@ -1,61 +1,65 @@
package org.wicketstuff.egrid.model;

import java.io.Serial;
import java.io.Serializable;

public class Person implements Serializable
{
private static final long serialVersionUID = 1L;

private String name;
private String address;
private String age;

public Person()
{

}
public Person(String name)
{
this.name = name;
}
public Person(String name, String age, String address)
{
this.name = name;
this.age = age;
this.address = address;
}

public String getName()
{
return name;
}

public void setName(String name)
{
this.name = name;
}

public String getAge()
{
return age;
}

public void setAge(String age)
{
this.age = age;
}

public String getAddress()
{
return address;
}
public void setAddress(String address)
{
this.address = address;
}
@Override
public String toString()
{
return name;
}
public class Person implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

private String name;
private String address;
private int age;
private boolean married;

public Person() {
}

public Person(final String name) {
this.name = name;
}

public Person(final String name, final int age, final String address, final boolean married) {
this.name = name;
this.age = age;
this.address = address;
this.married = married;
}

public String getName() {
return name;
}

public void setName(final String name) {
this.name = name;
}

public int getAge() {
return age;
}

public void setAge(final int age) {
this.age = age;
}

public String getAddress() {
return address;
}

public void setAddress(final String address) {
this.address = address;
}

public boolean isMarried() {
return married;
}

public void setMarried(boolean married) {
this.married = married;
}

@Override
public String toString() {
return name;
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<head>
<meta charset="utf-8" />
<title>Apache Wicket Quickstart</title>
</head>
<body>
<div wicket:id="feedBack"></div>
<div wicket:id="grid"></div>

<div id="ft">
</div>
</body>
<head>
<meta charset="utf-8">
<title>Apache Wicket Quickstart</title>
<link href="style.css" rel="stylesheet" type="text/css">
</head>
<body>
<div class="main">
<div wicket:id="grid"></div>
<div wicket:id="feedBack"></div>
</div>

<div id="ft">
</div>
</body>
</html>
Loading
Loading