Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 15853 invoked from network); 14 Sep 2007 12:48:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Sep 2007 12:48:54 -0000 Received: (qmail 38597 invoked by uid 500); 14 Sep 2007 12:48:47 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 38564 invoked by uid 500); 14 Sep 2007 12:48:47 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 38554 invoked by uid 99); 14 Sep 2007 12:48:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Sep 2007 05:48:47 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Sep 2007 12:50:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DC7811A983A; Fri, 14 Sep 2007 05:48:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r575665 - /incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxBundleDetailsAction.java Date: Fri, 14 Sep 2007 12:48:28 -0000 To: sling-commits@incubator.apache.org From: fmeschbe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070914124828.DC7811A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fmeschbe Date: Fri Sep 14 05:48:27 2007 New Revision: 575665 URL: http://svn.apache.org/viewvc?rev=575665&view=rev Log: Revert some unneded this. prefixes Modified: incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxBundleDetailsAction.java Modified: incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxBundleDetailsAction.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxBundleDetailsAction.java?rev=575665&r1=575664&r2=575665&view=diff ============================================================================== --- incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxBundleDetailsAction.java (original) +++ incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxBundleDetailsAction.java Fri Sep 14 05:48:27 2007 @@ -70,29 +70,29 @@ HttpServletResponse response) throws IOException, ServletException { JSONObject result = null; try { - long bundleId = this.getBundleId(request); - Bundle bundle = this.getBundleContext().getBundle(bundleId); + long bundleId = getBundleId(request); + Bundle bundle = getBundleContext().getBundle(bundleId); if (bundle != null) { Dictionary headers = bundle.getHeaders(); JSONArray props = new JSONArray(); - this.keyVal(props, "Symbolic Name", bundle.getSymbolicName()); - this.keyVal(props, "Version", headers.get(Constants.BUNDLE_VERSION)); - this.keyVal(props, "Location", bundle.getLocation()); - this.keyVal(props, "Last Modification", new Date( + keyVal(props, "Symbolic Name", bundle.getSymbolicName()); + keyVal(props, "Version", headers.get(Constants.BUNDLE_VERSION)); + keyVal(props, "Location", bundle.getLocation()); + keyVal(props, "Last Modification", new Date( bundle.getLastModified())); - this.keyVal(props, "Vendor", headers.get(Constants.BUNDLE_VENDOR)); - this.keyVal(props, "Copyright", + keyVal(props, "Vendor", headers.get(Constants.BUNDLE_VENDOR)); + keyVal(props, "Copyright", headers.get(Constants.BUNDLE_COPYRIGHT)); - this.keyVal(props, "Description", + keyVal(props, "Description", headers.get(Constants.BUNDLE_DESCRIPTION)); - this.keyVal(props, "Start Level", this.getStartLevel(bundle)); + keyVal(props, "Start Level", getStartLevel(bundle)); - this.listImportExport(props, bundle); + listImportExport(props, bundle); - this.listServices(props, bundle); + listServices(props, bundle); result = new JSONObject(); result.put(BundleListRender.BUNDLE_ID, bundleId); @@ -111,15 +111,15 @@ } private Integer getStartLevel(Bundle bundle) { - if (this.startLevelService == null) { + if (startLevelService == null) { return null; } - return new Integer(this.startLevelService.getBundleStartLevel(bundle)); + return new Integer(startLevelService.getBundleStartLevel(bundle)); } private void listImportExport(JSONArray props, Bundle bundle) { - ExportedPackage[] exports = this.packageAdmin.getExportedPackages(bundle); + ExportedPackage[] exports = packageAdmin.getExportedPackages(bundle); if (exports != null && exports.length > 0) { StringBuffer val = new StringBuffer(); for (int i = 0; i < exports.length; i++) { @@ -128,12 +128,12 @@ val.append(exports[i].getVersion()); val.append("
"); } - this.keyVal(props, "Exported Packages", val.toString()); + keyVal(props, "Exported Packages", val.toString()); } else { - this.keyVal(props, "Exported Packages", "None"); + keyVal(props, "Exported Packages", "None"); } - exports = this.packageAdmin.getExportedPackages((Bundle) null); + exports = packageAdmin.getExportedPackages((Bundle) null); if (exports != null && exports.length > 0) { StringBuffer val = new StringBuffer(); for (int i = 0; i < exports.length; i++) { @@ -160,7 +160,7 @@ val.append("None"); } - this.keyVal(props, "Imported Packages", val.toString()); + keyVal(props, "Imported Packages", val.toString()); } } @@ -176,22 +176,22 @@ StringBuffer val = new StringBuffer(); - this.appendProperty(val, refs[i], Constants.OBJECTCLASS, "Types"); - this.appendProperty(val, refs[i], "sling.context", "Sling Context"); - this.appendProperty(val, refs[i], Constants.SERVICE_PID, "PID"); - this.appendProperty(val, refs[i], ConfigurationAdmin.SERVICE_FACTORYPID, + appendProperty(val, refs[i], Constants.OBJECTCLASS, "Types"); + appendProperty(val, refs[i], "sling.context", "Sling Context"); + appendProperty(val, refs[i], Constants.SERVICE_PID, "PID"); + appendProperty(val, refs[i], ConfigurationAdmin.SERVICE_FACTORYPID, "Factory PID"); - this.appendProperty(val, refs[i], ComponentConstants.COMPONENT_NAME, + appendProperty(val, refs[i], ComponentConstants.COMPONENT_NAME, "Component Name"); - this.appendProperty(val, refs[i], ComponentConstants.COMPONENT_ID, + appendProperty(val, refs[i], ComponentConstants.COMPONENT_ID, "Component ID"); - this.appendProperty(val, refs[i], ComponentConstants.COMPONENT_FACTORY, + appendProperty(val, refs[i], ComponentConstants.COMPONENT_FACTORY, "Component Factory"); - this.appendProperty(val, refs[i], Constants.SERVICE_DESCRIPTION, + appendProperty(val, refs[i], Constants.SERVICE_DESCRIPTION, "Description"); - this.appendProperty(val, refs[i], Constants.SERVICE_VENDOR, "Vendor"); + appendProperty(val, refs[i], Constants.SERVICE_VENDOR, "Vendor"); - this.keyVal(props, key, val.toString()); + keyVal(props, key, val.toString()); } } @@ -222,23 +222,5 @@ // don't care } } - } - - // --------- SCR ----------------------------------------------------------- - - protected void bindStartLevel(StartLevel startLevelService) { - this.startLevelService = startLevelService; - } - - protected void unbindStartLevel(StartLevel startLevelService) { - this.startLevelService = null; - } - - protected void bindPackageAdmin(PackageAdmin packageAdmin) { - this.packageAdmin = packageAdmin; - } - - protected void unbindPackageAdmin(PackageAdmin packageAdmin) { - this.packageAdmin = null; } }