Context Navigation

← Previous Change
Next Change →

main

Timestamp:

04/01/14 12:37:27 (11 years ago)

Author:

Twan Goosen

Message:

refactored panels package, added two child packages for record and search related panels

Location:

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket

Files:

: 2 added
: 4 edited
: 24 moved

components/FieldValueOrderSelector.java (modified) (1 diff)
pages/AllFacetValuesPage.java (modified) (1 diff)
pages/FacetedSearchPage.java (modified) (1 diff)
pages/RecordPage.java (modified) (2 diffs)
panels/record (added)
panels/record/FieldsTablePanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/FieldsTablePanel.html)
panels/record/FieldsTablePanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/FieldsTablePanel.java) (1 diff)
panels/record/RecordNavigationPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/RecordNavigationPanel.html)
panels/record/RecordNavigationPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/RecordNavigationPanel.java) (1 diff)
panels/record/RecordNavigationPanel.properties (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/RecordNavigationPanel.properties)
panels/record/ResourceLinkDetailsPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/ResourceLinkDetailsPanel.html)
panels/record/ResourceLinkDetailsPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/ResourceLinkDetailsPanel.java) (1 diff)
panels/record/ResourceLinksPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/ResourceLinksPanel.html)
panels/record/ResourceLinksPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/ResourceLinksPanel.java) (1 diff)
panels/record/ResourceLinksPanel.properties (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/ResourceLinksPanel.properties)
panels/search (added)
panels/search/AllFacetValuesPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/AllFacetValuesPanel.html)
panels/search/AllFacetValuesPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/AllFacetValuesPanel.java) (1 diff)
panels/search/FacetPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetPanel.html)
panels/search/FacetPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetPanel.java) (1 diff)
panels/search/FacetValuesPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetValuesPanel.html)
panels/search/FacetValuesPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetValuesPanel.java) (1 diff)
panels/search/FacetsPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetsPanel.html)
panels/search/FacetsPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetsPanel.java) (1 diff)
panels/search/SearchResultItemPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/SearchResultItemPanel.html)
panels/search/SearchResultItemPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/SearchResultItemPanel.java) (1 diff)
panels/search/SearchResultsPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/SearchResultsPanel.html)
panels/search/SearchResultsPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/SearchResultsPanel.java) (1 diff)
panels/search/SelectedFacetPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/SelectedFacetPanel.html)
panels/search/SelectedFacetPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/SelectedFacetPanel.java) (1 diff)

Legend:

: Unmodified
: Added
: Removed

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/FieldValueOrderSelector.java

r4665	r4872
19	19	import com.google.common.collect.ImmutableList;
20	20	import eu.clarin.cmdi.vlo.pojo.FieldValuesOrder;
21		import eu.clarin.cmdi.vlo.wicket.panels.AllFacetValuesPanel;
	21	import eu.clarin.cmdi.vlo.wicket.panels.search.AllFacetValuesPanel;
22	22	import java.util.List;
23	23	import java.util.Locale;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/AllFacetValuesPage.java

r4869	r4872
22	22	import eu.clarin.cmdi.vlo.wicket.model.FacetFieldModel;
23	23	import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
24		import eu.clarin.cmdi.vlo.wicket.panels.AllFacetValuesPanel;
	24	import eu.clarin.cmdi.vlo.wicket.panels.search.AllFacetValuesPanel;
25	25	import eu.clarin.cmdi.vlo.wicket.panels.BreadCrumbPanel;
26	26	import java.util.Collection;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java

-                      r4869
+                      r4872
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.pojo.ExpansionState;
 import eu.clarin.cmdi.vlo.wicket.panels.FacetsPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.search.FacetsPanel;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.PageParametersConverter;
 import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 import eu.clarin.cmdi.vlo.wicket.panels.FacetPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.search.FacetPanel;
 import eu.clarin.cmdi.vlo.wicket.components.SearchForm;
 import eu.clarin.cmdi.vlo.wicket.panels.SearchResultsPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.search.SearchResultsPanel;
 import eu.clarin.cmdi.vlo.wicket.model.FacetFieldModel;
 import eu.clarin.cmdi.vlo.wicket.model.FacetFieldsModel;
 import eu.clarin.cmdi.vlo.wicket.model.FacetSelectionModel;
 import eu.clarin.cmdi.vlo.wicket.panels.BreadCrumbPanel;
 import eu.clarin.cmdi.vlo.wicket.panels.FacetValuesPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.search.FacetValuesPanel;
 import eu.clarin.cmdi.vlo.wicket.panels.PermaLinkPanel;
 import java.util.List;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java

-                      r4805
+                      r4872
 import eu.clarin.cmdi.vlo.service.FieldFilter;
 import eu.clarin.cmdi.vlo.service.PageParametersConverter;
 import eu.clarin.cmdi.vlo.wicket.panels.FieldsTablePanel;
 import eu.clarin.cmdi.vlo.wicket.panels.ResourceLinksPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.record.FieldsTablePanel;
+import eu.clarin.cmdi.vlo.wicket.panels.record.ResourceLinksPanel;
 import eu.clarin.cmdi.vlo.wicket.components.SolrFieldLabel;
 import eu.clarin.cmdi.vlo.wicket.model.HandleLinkModel;
 …
 import eu.clarin.cmdi.vlo.wicket.panels.BreadCrumbPanel;
 import eu.clarin.cmdi.vlo.wicket.panels.PermaLinkPanel;
 import eu.clarin.cmdi.vlo.wicket.panels.RecordNavigationPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.record.RecordNavigationPanel;
 import eu.clarin.cmdi.vlo.wicket.provider.DocumentFieldsProvider;
 import org.apache.solr.common.SolrDocument;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java

r4762	r4872
15	15	* along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16	*/
17		package eu.clarin.cmdi.vlo.wicket.panels;
	17	package eu.clarin.cmdi.vlo.wicket.panels.record;
18	18
19	19	import eu.clarin.cmdi.vlo.pojo.DocumentField;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/RecordNavigationPanel.java

r4762	r4872
15	15	* along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16	*/
17		package eu.clarin.cmdi.vlo.wicket.panels;
	17	package eu.clarin.cmdi.vlo.wicket.panels.record;
18	18
19	19	import eu.clarin.cmdi.vlo.pojo.SearchContext;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/ResourceLinkDetailsPanel.java

r4808	r4872
15	15	* along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16	*/
17		package eu.clarin.cmdi.vlo.wicket.panels;
	17	package eu.clarin.cmdi.vlo.wicket.panels.record;
18	18
19	19	import eu.clarin.cmdi.vlo.pojo.ResourceInfo;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/ResourceLinksPanel.java

r4762	r4872
15	15	* along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16	*/
17		package eu.clarin.cmdi.vlo.wicket.panels;
	17	package eu.clarin.cmdi.vlo.wicket.panels.record;
18	18
19	19	import eu.clarin.cmdi.vlo.pojo.ResourceInfo;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AllFacetValuesPanel.java

r4812	r4872
15	15	* along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16	*/
17		package eu.clarin.cmdi.vlo.wicket.panels;
	17	package eu.clarin.cmdi.vlo.wicket.panels.search;
18	18
19	19	import eu.clarin.cmdi.vlo.wicket.components.FieldValueOrderSelector;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetPanel.java

r4848	r4872
15	15	* along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16	*/
17		package eu.clarin.cmdi.vlo.wicket.panels;
	17	package eu.clarin.cmdi.vlo.wicket.panels.search;
18	18
19	19	import eu.clarin.cmdi.vlo.pojo.ExpansionState;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetValuesPanel.java

r4867	r4872
15	15	* along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16	*/
17		package eu.clarin.cmdi.vlo.wicket.panels;
	17	package eu.clarin.cmdi.vlo.wicket.panels.search;
18	18
19	19	import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetsPanel.java

r4869	r4872
15	15	* along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16	*/
17		package eu.clarin.cmdi.vlo.wicket.panels;
	17	package eu.clarin.cmdi.vlo.wicket.panels.search;
18	18
19	19	import eu.clarin.cmdi.vlo.pojo.ExpansionState;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemPanel.java

r4871	r4872
15	15	* along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16	*/
17		package eu.clarin.cmdi.vlo.wicket.panels;
	17	package eu.clarin.cmdi.vlo.wicket.panels.search;
18	18
19	19	import eu.clarin.cmdi.vlo.wicket.provider.ResouceTypeCountDataProvider;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultsPanel.java

r4810	r4872
15	15	* along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16	*/
17		package eu.clarin.cmdi.vlo.wicket.panels;
	17	package eu.clarin.cmdi.vlo.wicket.panels.search;
18	18
19	19	import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SelectedFacetPanel.java

r4798	r4872
15	15	* along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16	*/
17		package eu.clarin.cmdi.vlo.wicket.panels;
	17	package eu.clarin.cmdi.vlo.wicket.panels.search;
18	18
19	19	import eu.clarin.cmdi.vlo.pojo.FacetSelection;

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 4872 for vlo/branches/vlo-3.0/vlo-web-app/src/main

Legend:

Download in other formats: