Classifier object with a label or synonym that matches the given term. Searches all nodes
- * that are children of the given attribute root nodes including the root nodes.
+ * Returns the root Classifier which is referenced by the given MdAttributeTerm.
*
- * @param sfTermToMatch
- * @param mdAttributeTermDAO
- * @return the Classifier object with a label or synonym that matches the given term.
+ * @param mdAttributeTermDAOIF
+ * @return the Classifier object
*/
public static Classifier findClassifierRoot(MdAttributeTermDAOIF mdAttributeTermDAOIF)
{
@@ -886,7 +884,7 @@ public static Classifier createOption(String option)
Classifier.validateCategoryName(label, null);
}
- if (object.has("parentId"))
+ if (object.has("parentId") && object.getString("parentId").length() > 0)
{
String parentId = object.getString("parentId");
diff --git a/geoprism-server/src/main/java-gen/stub/net/geoprism/ontology/GeoEntityUtil.java b/geoprism-server/src/main/java-gen/stub/net/geoprism/ontology/GeoEntityUtil.java
index c3fc6885b..9a14737ea 100644
--- a/geoprism-server/src/main/java-gen/stub/net/geoprism/ontology/GeoEntityUtil.java
+++ b/geoprism-server/src/main/java-gen/stub/net/geoprism/ontology/GeoEntityUtil.java
@@ -3,45 +3,55 @@
*
* This file is part of Runway SDK(tm).
*
- * Runway SDK(tm) 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 3 of the
- * License, or (at your option) any later version.
+ * Runway SDK(tm) 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 3 of the License, or (at your option) any
+ * later version.
*
- * Runway SDK(tm) 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.
+ * Runway SDK(tm) 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 Runway SDK(tm). If not, see
+
+
+
+
+
+
\ No newline at end of file
diff --git a/geoprism-web/src/main/ng2/src/app/app.component.ts b/geoprism-web/src/main/ng2/src/app/app.component.ts
new file mode 100644
index 000000000..1dbb4c1f1
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/app.component.ts
@@ -0,0 +1,36 @@
+///
+/// Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
+///
+/// This file is part of Runway SDK(tm).
+///
+/// Runway SDK(tm) 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 3 of the
+/// License, or (at your option) any later version.
+///
+/// Runway SDK(tm) 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 Runway SDK(tm). If not, see
+
+
+
+
+
diff --git a/geoprism-web/src/main/ng2/src/app/category/category-detail.component.ts b/geoprism-web/src/main/ng2/src/app/category/category-detail.component.ts
new file mode 100644
index 000000000..415b9df1d
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/category/category-detail.component.ts
@@ -0,0 +1,138 @@
+///
+/// Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
+///
+/// This file is part of Runway SDK(tm).
+///
+/// Runway SDK(tm) 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 3 of the
+/// License, or (at your option) any later version.
+///
+/// Runway SDK(tm) 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 Runway SDK(tm). If not, see
+
diff --git a/geoprism-web/src/main/ng2/src/app/category/option-detail.component.ts b/geoprism-web/src/main/ng2/src/app/category/option-detail.component.ts
new file mode 100644
index 000000000..1bbc2f546
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/category/option-detail.component.ts
@@ -0,0 +1,121 @@
+///
+/// Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
+///
+/// This file is part of Runway SDK(tm).
+///
+/// Runway SDK(tm) 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 3 of the
+/// License, or (at your option) any later version.
+///
+/// Runway SDK(tm) 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 Runway SDK(tm). If not, see
+
+
+
\ No newline at end of file
diff --git a/geoprism-web/src/main/ng2/src/app/confirm/confirm-modal.component.ts b/geoprism-web/src/main/ng2/src/app/confirm/confirm-modal.component.ts
new file mode 100644
index 000000000..0c394a6ee
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/confirm/confirm-modal.component.ts
@@ -0,0 +1,57 @@
+import { Component, OnInit} from "@angular/core";
+
+import { ConfirmService, IListener, IAction } from "./confirm-modal.service";
+
+@Component({
+
+ selector: "confirm-modal",
+ templateUrl: './confirm-modal.component.html',
+ styleUrls: ['./confirm-modal.component.css'],
+})
+export class ConfirmModalComponent implements OnInit, IListener {
+
+ private action: IAction;
+ private message: string;
+ private active: boolean = false;
+
+ constructor(private service: ConfirmService) { }
+
+ ngOnInit(): void {
+ this.service.registerListener(this);
+ }
+
+ ngOnDestroy(): void {
+ this.service.deregisterListener(this);
+ }
+
+ public open(action: IAction): void {
+ if(this.action == null) {
+ this.action = action;
+
+ this.message = action.getMessage();
+ this.active = true;
+ }
+ }
+
+ public confirm(): void {
+ if(this.action != null) {
+ this.action.confirm();
+
+ this.action = undefined;
+ }
+
+ this.active = false;
+ this.message = undefined;
+ }
+
+ public cancel(): void {
+ if(this.action != null) {
+ this.action.cancel();
+
+ this.action = undefined;
+ }
+
+ this.active = false;
+ this.message = undefined;
+ }
+}
\ No newline at end of file
diff --git a/geoprism-web/src/main/ng2/src/app/confirm/confirm-modal.directive.ts b/geoprism-web/src/main/ng2/src/app/confirm/confirm-modal.directive.ts
new file mode 100644
index 000000000..02719eeb7
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/confirm/confirm-modal.directive.ts
@@ -0,0 +1,43 @@
+import {Directive, Input, Output, EventEmitter, HostListener} from "@angular/core";
+
+import { ConfirmService, IAction } from "./confirm-modal.service";
+
+@Directive({
+ selector: "[confirm-modal]"
+})
+export class ConfirmModalDirective implements IAction {
+
+ @Input() enabled: boolean = true;
+ @Input() message: string = "Are you sure?";
+
+ @Output() onConfirm = new EventEmitter();
+
+ constructor(private service: ConfirmService) {
+ }
+
+ /**
+ * On key event is triggered when a key is released on the host component
+ * the event starts a timer to prevent concurrent requests
+ */
+ @HostListener('click')
+ public onClick(): void {
+ if(this.enabled){
+ this.service.open(this);
+ }
+ else {
+ this.onConfirm.emit();
+ }
+ }
+
+ getMessage(): string {
+ return this.message;
+ }
+
+ confirm(): void {
+ this.onConfirm.emit();
+ }
+
+ cancel(): void {
+
+ }
+}
\ No newline at end of file
diff --git a/geoprism-web/src/main/ng2/src/app/confirm/confirm-modal.service.ts b/geoprism-web/src/main/ng2/src/app/confirm/confirm-modal.service.ts
new file mode 100644
index 000000000..1ba844f84
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/confirm/confirm-modal.service.ts
@@ -0,0 +1,33 @@
+import { Injectable } from "@angular/core";
+
+export interface IAction {
+ getMessage(): string;
+ confirm(): void;
+ cancel(): void;
+}
+
+export interface IListener {
+ open(action: IAction): void;
+}
+
+@Injectable()
+export class ConfirmService {
+ private listeners: IListener[] = [];
+
+ public constructor() {}
+
+ public registerListener(listener: IListener): void {
+ this.listeners.push(listener);
+ }
+
+ public deregisterListener(listener: IListener): void {
+ this.listeners = this.listeners.filter(h => h !== listener);
+ }
+
+ public open(action: IAction): void {
+ for (const listener of this.listeners) {
+ listener.open(action);
+ }
+ }
+}
+
diff --git a/geoprism-web/src/main/ng2/src/app/core/async-validator.directive.ts b/geoprism-web/src/main/ng2/src/app/core/async-validator.directive.ts
new file mode 100644
index 000000000..4ee6b4628
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/core/async-validator.directive.ts
@@ -0,0 +1,48 @@
+///
+/// Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
+///
+/// This file is part of Runway SDK(tm).
+///
+/// Runway SDK(tm) 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 3 of the
+/// License, or (at your option) any later version.
+///
+/// Runway SDK(tm) 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 Runway SDK(tm). If not, see
+
+
diff --git a/geoprism-web/src/main/ng2/src/app/core/message.component.ts b/geoprism-web/src/main/ng2/src/app/core/message.component.ts
new file mode 100644
index 000000000..e04f5b402
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/core/message.component.ts
@@ -0,0 +1,42 @@
+import { Component, OnInit } from '@angular/core';
+
+import { EventService, IEventListener } from '../service/core.service';
+
+@Component({
+
+ selector: 'message',
+ templateUrl: './message.component.html',
+ styleUrls: ['./message.component.css']
+})
+export class MessageComponent implements OnInit, IEventListener {
+
+ private error: any = null;
+
+ private message: string = "";
+
+ constructor(private service: EventService) { }
+
+ ngOnInit(): void {
+ this.service.registerListener(this);
+ }
+
+ ngOnDestroy(): void {
+ this.service.deregisterListener(this);
+ }
+
+ start(): void {
+ this.error = null;
+ }
+
+ complete(): void {
+ console.log('complete');
+ }
+
+ onError(error: any): void {
+ this.error = error;
+ }
+
+ onMessage(msg: string): void {
+ this.message = msg;
+ }
+}
diff --git a/geoprism-web/src/main/ng2/src/app/datasets/dataset-detail.component.html b/geoprism-web/src/main/ng2/src/app/datasets/dataset-detail.component.html
new file mode 100644
index 000000000..19b3f62ff
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/datasets/dataset-detail.component.html
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/geoprism-web/src/main/ng2/src/app/datasets/dataset-detail.component.ts b/geoprism-web/src/main/ng2/src/app/datasets/dataset-detail.component.ts
new file mode 100644
index 000000000..bb0841480
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/datasets/dataset-detail.component.ts
@@ -0,0 +1,102 @@
+///
+/// Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
+///
+/// This file is part of Runway SDK(tm).
+///
+/// Runway SDK(tm) 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 3 of the
+/// License, or (at your option) any later version.
+///
+/// Runway SDK(tm) 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 Runway SDK(tm). If not, see
+
+
+
+
diff --git a/geoprism-web/src/main/ng2/src/app/datasets/datasets.component.ts b/geoprism-web/src/main/ng2/src/app/datasets/datasets.component.ts
new file mode 100644
index 000000000..1cf75dcb4
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/datasets/datasets.component.ts
@@ -0,0 +1,150 @@
+///
+/// Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
+///
+/// This file is part of Runway SDK(tm).
+///
+/// Runway SDK(tm) 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 3 of the
+/// License, or (at your option) any later version.
+///
+/// Runway SDK(tm) 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 Runway SDK(tm). If not, see
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/geoprism-web/src/main/ng2/src/app/icon/icon-detail.component.ts b/geoprism-web/src/main/ng2/src/app/icon/icon-detail.component.ts
new file mode 100644
index 000000000..0d7d45ae8
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/icon/icon-detail.component.ts
@@ -0,0 +1,175 @@
+///
+/// Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
+///
+/// This file is part of Runway SDK(tm).
+///
+/// Runway SDK(tm) 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 3 of the
+/// License, or (at your option) any later version.
+///
+/// Runway SDK(tm) 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 Runway SDK(tm). If not, see
+
+
diff --git a/geoprism-web/src/main/ng2/src/app/icon/icons.component.ts b/geoprism-web/src/main/ng2/src/app/icon/icons.component.ts
new file mode 100644
index 000000000..69a6e669f
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/icon/icons.component.ts
@@ -0,0 +1,71 @@
+///
+/// Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
+///
+/// This file is part of Runway SDK(tm).
+///
+/// Runway SDK(tm) 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 3 of the
+/// License, or (at your option) any later version.
+///
+/// Runway SDK(tm) 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 Runway SDK(tm). If not, see
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/geoprism-web/src/main/ng2/src/app/uploader/category-validation-problem.component.ts b/geoprism-web/src/main/ng2/src/app/uploader/category-validation-problem.component.ts
new file mode 100644
index 000000000..62b8aecef
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/uploader/category-validation-problem.component.ts
@@ -0,0 +1,170 @@
+///
+/// Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
+///
+/// This file is part of Runway SDK(tm).
+///
+/// Runway SDK(tm) 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 3 of the
+/// License, or (at your option) any later version.
+///
+/// Runway SDK(tm) 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 Runway SDK(tm). If not, see
+
+
+
+
\ No newline at end of file
diff --git a/geoprism-web/src/main/ng2/src/app/uploader/geo-validation-problem.component.ts b/geoprism-web/src/main/ng2/src/app/uploader/geo-validation-problem.component.ts
new file mode 100644
index 000000000..2d2159633
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/uploader/geo-validation-problem.component.ts
@@ -0,0 +1,173 @@
+///
+/// Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
+///
+/// This file is part of Runway SDK(tm).
+///
+/// Runway SDK(tm) 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 3 of the
+/// License, or (at your option) any later version.
+///
+/// Runway SDK(tm) 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 Runway SDK(tm). If not, see
+
+
+
+
+
diff --git a/geoprism-web/src/main/ng2/src/app/uploader/paging.component.ts b/geoprism-web/src/main/ng2/src/app/uploader/paging.component.ts
new file mode 100644
index 000000000..cff3be530
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/uploader/paging.component.ts
@@ -0,0 +1,54 @@
+///
+/// Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
+///
+/// This file is part of Runway SDK(tm).
+///
+/// Runway SDK(tm) 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 3 of the
+/// License, or (at your option) any later version.
+///
+/// Runway SDK(tm) 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 Runway SDK(tm). If not, see
+
+
+
+
+
+
diff --git a/geoprism-web/src/main/ng2/src/app/uploader/upload-wizard.component.ts b/geoprism-web/src/main/ng2/src/app/uploader/upload-wizard.component.ts
new file mode 100644
index 000000000..cacc19393
--- /dev/null
+++ b/geoprism-web/src/main/ng2/src/app/uploader/upload-wizard.component.ts
@@ -0,0 +1,555 @@
+///
+/// Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
+///
+/// This file is part of Runway SDK(tm).
+///
+/// Runway SDK(tm) 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 3 of the
+/// License, or (at your option) any later version.
+///
+/// Runway SDK(tm) 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 Runway SDK(tm). If not, see
+
+
+