Return-Path: X-Original-To: apmail-nifi-commits-archive@minotaur.apache.org Delivered-To: apmail-nifi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7A5AE17A82 for ; Mon, 6 Apr 2015 20:30:40 +0000 (UTC) Received: (qmail 66281 invoked by uid 500); 6 Apr 2015 20:30:40 -0000 Delivered-To: apmail-nifi-commits-archive@nifi.apache.org Received: (qmail 66244 invoked by uid 500); 6 Apr 2015 20:30:40 -0000 Mailing-List: contact commits-help@nifi.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nifi.incubator.apache.org Delivered-To: mailing list commits@nifi.incubator.apache.org Received: (qmail 66235 invoked by uid 99); 6 Apr 2015 20:30:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2015 20:30:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 06 Apr 2015 20:30:39 +0000 Received: (qmail 65818 invoked by uid 99); 6 Apr 2015 20:30:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2015 20:30:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A3AC2E181A; Mon, 6 Apr 2015 20:30:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mcgilman@apache.org To: commits@nifi.incubator.apache.org Date: Mon, 06 Apr 2015 20:30:21 -0000 Message-Id: <0a6d164e98d349a9802514bd2fb03ee6@git.apache.org> In-Reply-To: <095a8c316e634c68ab9325226294f22d@git.apache.org> References: <095a8c316e634c68ab9325226294f22d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] incubator-nifi git commit: NIFI-475: - Adding support to create controller services inline when editing a components properties. X-Virus-Checked: Checked by ClamAV on apache.org NIFI-475: - Adding support to create controller services inline when editing a components properties. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/31ec55c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/31ec55c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/31ec55c3 Branch: refs/heads/NIFI-475 Commit: 31ec55c38c5434070ee22d4ca5602ee38ea547f8 Parents: 9682d8a Author: Matt Gilman Authored: Mon Apr 6 16:29:27 2015 -0400 Committer: Matt Gilman Committed: Mon Apr 6 16:29:27 2015 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/31ec55c3/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java index d10a324..ecde255 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java @@ -34,7 +34,7 @@ public class PropertyDescriptorDTO { private boolean sensitive; private boolean dynamic; private boolean supportsEl; - private boolean identifiesControllerService; + private String identifiesControllerService; /** * The set of allowable values for this property. If empty then the @@ -158,15 +158,16 @@ public class PropertyDescriptorDTO { } /** - * Whether this descriptor represents a controller service. + * If this property identifies a controller service, this returns the + * fully qualified type, null otherwise. * * @return */ - public boolean isIdentifiesControllerService() { + public String getIdentifiesControllerService() { return identifiesControllerService; } - public void setIdentifiesControllerService(boolean identifiesControllerService) { + public void setIdentifiesControllerService(String identifiesControllerService) { this.identifiesControllerService = identifiesControllerService; }